Merge pull request #64 from tangrams/nvkelso/tangram-es-7.2.1-support

refactor for tangram es 7.2.1 support
tangrams · Jun 20, 2017 · 556fe9a · 556fe9a
2 parents b232883 + a7e63d4
commit 556fe9a
Show file tree

Hide file tree

Showing 31 changed files with 16 additions and 26 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,2 @@
 .DS_Store
-dist/*.zip
+dist
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-7.2.0
+7.2.1
diff --git a/dist/themes/black.zip b/dist/themes/black.zip
diff --git a/dist/themes/blue-gray.zip b/dist/themes/blue-gray.zip
diff --git a/dist/themes/blue.zip b/dist/themes/blue.zip
diff --git a/dist/themes/brown-orange.zip b/dist/themes/brown-orange.zip
diff --git a/dist/themes/color.zip b/dist/themes/color.zip
diff --git a/dist/themes/gray-gold.zip b/dist/themes/gray-gold.zip
diff --git a/dist/themes/gray.zip b/dist/themes/gray.zip
diff --git a/dist/themes/high-contrast.zip b/dist/themes/high-contrast.zip
diff --git a/dist/themes/inverted-blue.zip b/dist/themes/inverted-blue.zip
diff --git a/dist/themes/inverted.zip b/dist/themes/inverted.zip
diff --git a/dist/themes/pink-yellow.zip b/dist/themes/pink-yellow.zip
diff --git a/dist/themes/pink.zip b/dist/themes/pink.zip
diff --git a/dist/themes/purple-green.zip b/dist/themes/purple-green.zip
diff --git a/dist/themes/sepia.zip b/dist/themes/sepia.zip
diff --git a/refill-style.yaml b/refill-style.yaml
@@ -1231,15 +1231,6 @@ styles:
                                     color.rgb,
                                     step(.5,dot(vec3(0., 0., 1.), worldNormal())));
 
-    rock:
-        base: polygons
-        material:
-            diffuse:
-                texture: images/building-grid.gif
-                mapping: planar
-                scale: .001
-
-
     building-lines:
         base: lines
         mix: scale-buildings
@@ -2608,8 +2599,7 @@ layers:
                     $zoom: { max: 15 }
                 draw:
                     lines:
-                        order:
-                            order: 351
+                        order: 351
                         outline:
                             order: 350
             pedestrian:
@@ -3997,7 +3987,7 @@ layers:
                     text-blend-order:
                         priority: 6
                         font:
-                            size: [[2,11px],[6,15px],[8,18px],[10,20px],[12,20x],[13,0px]]
+                            size: [[2,11px],[6,15px],[8,18px],[10,20px],[12,20px],[13,0px]]
                 capital:
                     filter: { country_capital: true, $zoom: { min: 5 } }
                     draw:

diff --git a/themes/blue-gray.yaml b/themes/blue-gray.yaml
@@ -257,6 +257,6 @@ styles:
 
 textures:
     building-grid:
-        url: ../images/building-grid-hi-contrast3.gif
+        url: images/building-grid-hi-contrast3.gif
 
 
diff --git a/themes/brown-orange.yaml b/themes/brown-orange.yaml
@@ -258,6 +258,6 @@ styles:
 
 textures:
     building-grid:
-        url: ../images/building-grid-hi-contrast3.gif
+        url: images/building-grid-hi-contrast3.gif
 
 
diff --git a/themes/color.yaml b/themes/color.yaml
@@ -486,8 +486,8 @@ styles:
         dash_background_color: [0.984,0.980,1.000]
 
 textures:
-    building-grid:
-        url: ../images/building-grid.gif
+#    building-grid:
+#        url: images/building-grid.gif
 
     building-grid-bold:
-        url: ../images/building-grid-bold.gif
+        url: images/building-grid-bold.gif
diff --git a/themes/gray-gold.yaml b/themes/gray-gold.yaml
@@ -305,4 +305,4 @@ styles:
 
 textures:
     building-grid:
-        url: ../images/building-grid-hi-contrast3.gif
+        url: images/building-grid-hi-contrast3.gif
diff --git a/themes/high-contrast.yaml b/themes/high-contrast.yaml
@@ -252,4 +252,4 @@ styles:
 
 textures:
     building-grid:
-        url: ../images/building-grid-hi-contrast3.gif
+        url: images/building-grid-hi-contrast3.gif
diff --git a/images/building-grid-bold.gif → themes/images/building-grid-bold.gif b/images/building-grid-bold.gif → themes/images/building-grid-bold.gif
diff --git a/images/building-grid-hi-contrast.gif → themes/images/building-grid-hi-contrast.gif b/images/building-grid-hi-contrast.gif → themes/images/building-grid-hi-contrast.gif
diff --git a/images/building-grid-hi-contrast2.gif → themes/images/building-grid-hi-contrast2.gif b/images/building-grid-hi-contrast2.gif → themes/images/building-grid-hi-contrast2.gif
diff --git a/images/building-grid-hi-contrast3.gif → themes/images/building-grid-hi-contrast3.gif b/images/building-grid-hi-contrast3.gif → themes/images/building-grid-hi-contrast3.gif
diff --git a/images/building-grid-hi-contrast4.gif → themes/images/building-grid-hi-contrast4.gif b/images/building-grid-hi-contrast4.gif → themes/images/building-grid-hi-contrast4.gif
diff --git a/themes/inverted-blue.yaml b/themes/inverted-blue.yaml
@@ -150,7 +150,7 @@ styles:
         base: polygons
         material:
             diffuse:
-                texture: ../images/rock.png
+                texture: images/rock.png
                 mapping: planar
                 scale: .001
 
@@ -294,4 +294,4 @@ styles:
 
 textures:
     building-grid:
-        url: ../images/building-grid-hi-contrast3.gif
+        url: images/building-grid-hi-contrast3.gif
diff --git a/themes/inverted.yaml b/themes/inverted.yaml
@@ -272,4 +272,4 @@ styles:
 
 textures:
     building-grid:
-        url: ../images/building-grid-hi-contrast3.gif
+        url: images/building-grid-hi-contrast3.gif
diff --git a/themes/pink-yellow.yaml b/themes/pink-yellow.yaml
@@ -258,6 +258,6 @@ styles:
 
 textures:
     building-grid:
-        url: ../images/building-grid-hi-contrast3.gif
+        url: images/building-grid-hi-contrast3.gif
 
 
diff --git a/themes/purple-green.yaml b/themes/purple-green.yaml
@@ -281,4 +281,4 @@ styles:
 
 textures:
     building-grid:
-        url: ../images/building-grid-hi-contrast3.gif
+        url: images/building-grid-hi-contrast3.gif