more tweaks on the way to publishing stamen maps update.

NUKnightLab · Oct 6, 2023 · 5422865 · 5422865
1 parent b7f84e0
commit 5422865
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 45 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+0.9.2 (2023-10-06)
+* Minor bug-fixes in advance of launching authoring tool update.
+
 0.9.1 (2023-10-02)
 * Hard-code preserving undefined map type as toner-lite, temporarily.
 

diff --git a/dotenv.example b/dotenv.example
@@ -3,7 +3,7 @@ AWS_ENDPOINT_URL=https://localstack:4566
 AWS_SSL_VERIFY=false
 AWS_STORAGE_BUCKET_KEY=storymapjs
 AWS_STORAGE_BUCKET_NAME=uploads.knilab.com
-AWS_STORAGE_BUCKET_URL=//localhost:4566/uploads.knilab.com/
+AWS_STORAGE_BUCKET_URL=http://localhost:4566/uploads.knilab.com/
 CDN_URL=https://localhost/compiled/
 DB_ENGINE__DEFAULT=mongo
 DB_HOST__DEFAULT=mongo

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "StoryMapJS",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "description": "StoryMapJS is a tool for telling stories through the context of places on a map. For more information, see storymap.knightlab.com",
   "private": "true",
   "directories": {

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -35,7 +35,6 @@ psycopg2-binary==2.8.5
 pyasn1==0.4.8
 pyasn1-modules==0.2.8
 pycparser==2.14
-pycrypto==2.6
 PyNaCl==1.3.0
 pyOpenSSL==20.0.1
 python-slugify==1.1.2

diff --git a/requirements.txt b/requirements.txt
@@ -33,7 +33,6 @@ psycopg2-binary==2.8.5
 pyasn1==0.4.8
 pyasn1-modules==0.2.8
 pycparser==2.14
-pycrypto==2.6
 PyNaCl==1.3.0
 pyOpenSSL==20.0.1
 python-slugify==1.1.2

diff --git a/src/embed/index.html b/src/embed/index.html
@@ -21,21 +21,21 @@
 
 <body>
   <div id="storymap-embed"></div>
-  <!-- Global site tag (gtag.js) - Google Analytics -->
-  <script async src="https://www.googletagmanager.com/gtag/js?id=UA-27829802-2"></script>
+
+  <!-- Google tag (gtag.js) -->
+  <script async src="https://www.googletagmanager.com/gtag/js?id=G-M95DDQGLWH"></script>
   <script>
     window.dataLayer = window.dataLayer || [];
-    function gtag(){ dataLayer.push(arguments); }
+    function gtag(){dataLayer.push(arguments);}
     gtag('js', new Date());
-    gtag('config', 'UA-27829802-2', {
-      'anonymize_ip': true,
-      'linker': { 'domains': ['knightlab.com'] }
-    });
+
+    gtag('config', 'G-M95DDQGLWH');
     gtag('event', 'EmbeddedIn', {
       'event_label': document.referrer,
       'event_category': 'StoryMapJS',
       'non_interaction': true
-    });
+    })
+
   </script>
 
   <script>

diff --git a/src/js/map/leaflet/Map.Leaflet.js b/src/js/map/leaflet/Map.Leaflet.js
@@ -29,8 +29,6 @@ export default class Leaflet extends Map {
 		this._map.on("moveend", this._onMapMoveEnd, this);
 		this._map.attributionControl.setPrefix("<a href='http://storymap.knightlab.com/' target='_blank' class='vco-knightlab-brand'><span>&#x25a0;</span> StoryMapJS</a>");
 
-		var map_type_arr = this.options.map_type.split(':');
-
 		// Create Tile Layer
 		this._tile_layer = this._createTileLayer(this.options.map_type);
 		this._tile_layer.on("load", this._onTilesLoaded, this);
@@ -242,8 +240,14 @@ export default class Leaflet extends Map {
 				break;
 
 			case 'ch-watercolor':
-				options.url = "https://watercolormaps.collection.cooperhewitt.org/tile/watercolor//{Z}/{X}/{Y}.png"
 				options.attribution = _attribution_knightlab + _attribution_cooperhewitt
+				options.type = 'jpg'
+				options.minZoom = 0
+				options.maxZoom = 16
+				_tilelayer = new L.TileLayer("https://watercolormaps.collection.cooperhewitt.org/tile/watercolor/{z}/{x}/{y}.jpg", options);
+
+				break;
+
 			case 'osm':
 			default: // osm is the default now
 				options.subdomains = 'ab';

diff --git a/src/js/map/tile/TileLayer.Stamen.js b/src/js/map/tile/TileLayer.Stamen.js
@@ -33,7 +33,7 @@ let PROVIDERS =  {
     "terrain":      MAKE_PROVIDER("stamen_terrain", "jpg", 4, 18),
     "watercolor": MAKE_PROVIDER("stamen_watercolor", "jpg", 0, 16),
     "ch_watercolor": {
-        "url": "https://watercolormaps.collection.cooperhewitt.org/tile/watercolor//{Z}/{X}/{Y}.png",
+        "url": "https://watercolormaps.collection.cooperhewitt.org/tile/watercolor//{z}/{x}/{y}.png",
         "type": 'png',
         "subdomains": '',
         "minZoom": 0,

diff --git a/storymap/templates/_analytics.html b/storymap/templates/_analytics.html
@@ -1,15 +1,9 @@
-<!-- Global site tag (gtag.js) - Google Analytics -->
-<script async src="https://www.googletagmanager.com/gtag/js?id=UA-27829802-1"></script>
+<!-- Google tag (gtag.js) -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=G-8F4WPDMPL5"></script>
 <script>
   window.dataLayer = window.dataLayer || [];
   function gtag(){dataLayer.push(arguments);}
   gtag('js', new Date());
 
-  gtag('config', 'UA-27829802-1',
-    {
-      'anonymize_ip': true,
-      'linker': {
-          'domains': ['knightlab.com']
-        }
-    });
+  gtag('config', 'G-8F4WPDMPL5');
 </script>
diff --git a/storymap/templates/_embed.html b/storymap/templates/_embed.html
@@ -36,28 +36,22 @@
 <body>
 <div id="storymap-embed"></div>
 
-<!-- Global site tag (gtag.js) - Google Analytics -->
-<script async src="https://www.googletagmanager.com/gtag/js?id=UA-27829802-2"></script>
-<script>
-  window.dataLayer = window.dataLayer || [];
-  function gtag(){dataLayer.push(arguments);}
-  gtag('js', new Date());
+<!-- Google tag (gtag.js) -->
+  <script async src="https://www.googletagmanager.com/gtag/js?id=G-M95DDQGLWH"></script>
+  <script>
+    window.dataLayer = window.dataLayer || [];
 
-  gtag('config', 'UA-27829802-2',
-    {
-      'anonymize_ip': true,
-      'linker': {
-          'domains': ['knightlab.com']
-        }
-    });
+    function gtag(){ dataLayer.push(arguments); }
+
+    gtag('js', new Date());
+    gtag('config', 'G-M95DDQGLWH');
+    gtag('event', 'EmbeddedIn', {
+      'event_label': document.referrer,
+      'event_category': 'StoryMapJS',
+      'non_interaction': true
+    })
 
-  gtag('event', 'EmbeddedIn', {
-    'event_label': document.referrer,
-    'event_category': 'StoryMapJS',
-    'non_interaction': true
-  });
-</script>
-<!-- End Google Analytics -->
+  </script>
 
 <script type="text/javascript">
     var storymap;