Skip to content

Commit

Permalink
add manufacturers
Browse files Browse the repository at this point in the history
  • Loading branch information
bobzilladev committed Aug 13, 2016
1 parent 1428fd9 commit 2e0c191
Show file tree
Hide file tree
Showing 16 changed files with 25,297 additions and 34 deletions.
16 changes: 8 additions & 8 deletions android-maps-utils/android-maps-utils.iml
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.0.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-base/9.2.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-basement/9.2.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-maps/9.2.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-tasks/9.2.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-base/9.4.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-basement/9.4.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-maps/9.4.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-tasks/9.4.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
Expand All @@ -104,11 +104,11 @@
</content>
<orderEntry type="jdk" jdkName="Android API 24 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="play-services-base-9.2.1" level="project" />
<orderEntry type="library" exported="" name="play-services-base-9.4.0" level="project" />
<orderEntry type="library" exported="" name="play-services-maps-9.4.0" level="project" />
<orderEntry type="library" exported="" name="play-services-basement-9.4.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-23.0.0" level="project" />
<orderEntry type="library" exported="" name="play-services-maps-9.2.1" level="project" />
<orderEntry type="library" exported="" name="play-services-basement-9.2.1" level="project" />
<orderEntry type="library" exported="" name="play-services-tasks-9.2.1" level="project" />
<orderEntry type="library" exported="" name="play-services-tasks-9.4.0" level="project" />
<orderEntry type="library" exported="" name="support-annotations-23.0.0" level="project" />
</component>
</module>
2 changes: 1 addition & 1 deletion android-maps-utils/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ apply plugin: 'signing'
group = 'com.google.maps.android'

dependencies {
compile 'com.google.android.gms:play-services-maps:9.2.1'
compile 'com.google.android.gms:play-services-maps:9.4.0'
}


Expand Down
Binary file added etc/mam.csv.gz
Binary file not shown.
34 changes: 34 additions & 0 deletions etc/oui-to-map.pl
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#!/usr/bin/perl -w
# data files from https://regauth.standards.ieee.org/standards-ra-web/pub/view.html#registries
use IO::Zlib;
use Text::CSV_XS qw( csv );

open FILER, "> ../wiglewifiwardriving/src/main/assets/oui.properties";
binmode FILER, ":utf8";

my $csv = Text::CSV_XS->new ({ binary => 1, auto_diag => 1 });

for my $file (('oui.csv.gz','mam.csv.gz','oui36.csv.gz')) {
print "file: $file\n";
my %header = ();
$fh = IO::Zlib->new($file, "rb");
while (my $row = $csv->getline($fh)) {
my @cols = @$row;
if (not %header) {
my $i = 0;
for $col (@cols) {
$header{$col} = $i;
$i++;
}
}
else {
my $key = $cols[$header{'Assignment'}];
my $val = $cols[$header{'Organization Name'}];
$val =~ s/"/\\"/g;
print FILER "$key=$val\n";
}
}
close $fh;
}

close FILER;
Binary file added etc/oui.csv.gz
Binary file not shown.
Binary file added etc/oui36.csv.gz
Binary file not shown.
Loading

0 comments on commit 2e0c191

Please sign in to comment.