feat(build): rebuild from latest data

pelias · Jul 10, 2018 · c5ed71a · c5ed71a
1 parent 6f0f865
commit c5ed71a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/cmd/jq.filter b/cmd/jq.filter
@@ -9,11 +9,10 @@
     test("^mz:(is_current|population)$"),
     test("^gn:(population|pop)$"),
     test("^zs:(pop10)$"),
-    test("^qs:(pop|gn_pop)$"),
+    test("^qs:(pop|gn_pop|photo_sum)$"),
     test("^wk:(population)$"),
     test("^meso:(pop)$"),
     test("^statoids:(population)$"),
-    test("^misc:(photo_sum)$"),
     test("^name:")
   )
 )
diff --git a/cmd/wof_extract.sh b/cmd/wof_extract.sh
@@ -41,4 +41,8 @@ function placetypeFilter {
 }
 
 # extract only the json properies from each file (eg: excluding zs:*)
-find "${WOF_DIR}" -type f -name '*.geojson' | placetypeFilter | ${XARGS_CMD} ${JQ_BIN} -c -M -f "${DIR}/jq.filter";
+# note: excludes 'alt' geometeries
+find "${WOF_DIR}" -type f -name '*.geojson' |\
+  grep -E '/[0-9]+\.geojson$' |\
+  placetypeFilter |\
+  ${XARGS_CMD} ${JQ_BIN} -c -M -f "${DIR}/jq.filter";
diff --git a/prototype/wof.js b/prototype/wof.js
@@ -26,7 +26,7 @@ function insertWofRecord( wof, next ){
     abbr: getAbbreviation( wof ),
     placetype: wof['wof:placetype'],
     population: getPopulation( wof ),
-    popularity: wof['misc:photo_sum'],
+    popularity: wof['qs:photo_sum'],
     lineage: wof['wof:hierarchy'],
     geom: {
       area: wof['geom:area'],

diff --git a/test/prototype/wof.js b/test/prototype/wof.js
@@ -216,7 +216,7 @@ module.exports.store_popularity = function(test, util) {
   test( 'popularity: exists', function(t) {
     var mock = new Mock();
     mock.insertWofRecord(params({
-      'misc:photo_sum': 100
+      'qs:photo_sum': 100
     }), function(){
       t.deepEqual( mock._calls.set[0][1].popularity, 100);
       t.end();
@@ -226,7 +226,7 @@ module.exports.store_popularity = function(test, util) {
   test( 'popularity: exists - as string', function(t) {
     var mock = new Mock();
     mock.insertWofRecord(params({
-      'misc:photo_sum': '100'
+      'qs:photo_sum': '100'
     }), function(){
       t.deepEqual( mock._calls.set[0][1].popularity, 100);
       t.end();