Merge pull request #22 from tangrams/nvkelso/no-default-mapzen-api-key

remove default Mapzen API key, a breaking change
tangrams · Mar 24, 2017 · 3e7d492 · 3e7d492
2 parents bf24a30 + b9bac8a
commit 3e7d492
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-5.0.1
+6.0.0
diff --git a/index.html b/index.html
@@ -22,9 +22,9 @@
 
         <!-- Main tangram library -->
         <!-- production -->
-        <script src="https://mapzen.com/tangram/0.11/tangram.min.js"></script>
+        <script src="https://mapzen.com/tangram/0.12/tangram.min.js"></script>
         <!-- production debug -->
-        <!-- <script src="https://mapzen.com/tangram/0.11/tangram.debug.js"></script> -->
+        <!-- <script src="https://mapzen.com/tangram/0.12/tangram.debug.js"></script> -->
         <!-- dev -->
         <!-- <script src="https://precog.mapzen.com/tangrams/tangram/master/dist/tangram.debug.js"></script> -->
         <!-- dev branch -->
@@ -626,14 +626,18 @@
                             // enable iD to show properties sidebar for selected feature
                             osm_type = 'node';
                             osm_zoom = '19'
-                            if( selection.feature.properties.sort_key ) {
+                            // tilezen adds sort_rank for any way or relation thing, but because we generate
+                            // label positions for area features, we need to do two tests
+                            if( selection.feature.properties.sort_rank || selection.feature.properties.area ) {
                                 osm_type = 'way';
                                 osm_zoom = Math.max( 17, map.getZoom() );
                             }
                             osm_id = selection.feature.properties.id;
                             if( osm_id < 0 ) {
                                 osm_type = 'relation'
                                 osm_id = Math.abs( osm_id );
+                                // zoom out a bit because we assume this is a larger feature
+                                // but don't zoom out too far, as iD breaks
                                 osm_zoom = Math.max( 16, map.getZoom() );
                             }
                             url += osm_type + '=' + osm_id;

diff --git a/zinc-style.yaml b/zinc-style.yaml
@@ -13,7 +13,7 @@
 global:
     # Sign up for a Mapzen API key to enjoy higher rate limits
     # https://mapzen.com/documentation/overview/#developer-accounts-and-api-keys
-    sdk_mapzen_api_key: mapzen-ZzW4tEy     # set this value to your Mapzen API key
+    sdk_mapzen_api_key: ''     # set this value to your Mapzen API key
 
     #ux/ui
     ux_language: false             # l10n language code, trusting OSM in v0.10 tiles, fixed in v1.0 tiles