Merge pull request #164 from osmlab/pre-merge

Merge v1.1.0 into master

?

@@ -0,0 +1 @@
+.toast-title{font-weight:700}.toast-message{-ms-word-wrap:break-word;word-wrap:break-word}.toast-message a,.toast-message label{color:#FFF}.toast-message a:hover{color:#CCC;text-decoration:none}.toast-close-button{position:relative;right:-.3em;top:-.3em;float:right;font-size:20px;font-weight:700;color:#FFF;-webkit-text-shadow:0 1px 0 #fff;text-shadow:0 1px 0 #fff;opacity:.8;-ms-filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=80);filter:alpha(opacity=80);line-height:1}.toast-close-button:focus,.toast-close-button:hover{color:#000;text-decoration:none;cursor:pointer;opacity:.4;-ms-filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=40);filter:alpha(opacity=40)}.rtl .toast-close-button{left:-.3em;float:left;right:.3em}button.toast-close-button{padding:0;cursor:pointer;background:0 0;border:0;-webkit-appearance:none}.toast-top-center{top:0;right:0;width:100%}.toast-bottom-center{bottom:0;right:0;width:100%}.toast-top-full-width{top:0;right:0;width:100%}.toast-bottom-full-width{bottom:0;right:0;width:100%}.toast-top-left{top:12px;left:12px}.toast-top-right{top:12px;right:12px}.toast-bottom-right{right:12px;bottom:12px}.toast-bottom-left{bottom:12px;left:12px}#toast-container{position:fixed;z-index:999999;pointer-events:none}#toast-container *{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}#toast-container>div{position:relative;pointer-events:auto;overflow:hidden;margin:0 0 6px;padding:15px 15px 15px 50px;width:300px;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;background-position:15px center;background-repeat:no-repeat;-moz-box-shadow:0 0 12px #999;-webkit-box-shadow:0 0 12px #999;box-shadow:0 0 12px #999;color:#FFF;opacity:.8;-ms-filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=80);filter:alpha(opacity=80)}#toast-container>div.rtl{direction:rtl;padding:15px 50px 15px 15px;background-position:right 15px center}#toast-container>div:hover{-moz-box-shadow:0 0 12px #000;-webkit-box-shadow:0 0 12px #000;box-shadow:0 0 12px #000;opacity:1;-ms-filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=100);filter:alpha(opacity=100);cursor:pointer}#toast-container>.toast-info{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGwSURBVEhLtZa9SgNBEMc9sUxxRcoUKSzSWIhXpFMhhYWFhaBg4yPYiWCXZxBLERsLRS3EQkEfwCKdjWJAwSKCgoKCcudv4O5YLrt7EzgXhiU3/4+b2ckmwVjJSpKkQ6wAi4gwhT+z3wRBcEz0yjSseUTrcRyfsHsXmD0AmbHOC9Ii8VImnuXBPglHpQ5wwSVM7sNnTG7Za4JwDdCjxyAiH3nyA2mtaTJufiDZ5dCaqlItILh1NHatfN5skvjx9Z38m69CgzuXmZgVrPIGE763Jx9qKsRozWYw6xOHdER+nn2KkO+Bb+UV5CBN6WC6QtBgbRVozrahAbmm6HtUsgtPC19tFdxXZYBOfkbmFJ1VaHA1VAHjd0pp70oTZzvR+EVrx2Ygfdsq6eu55BHYR8hlcki+n+kERUFG8BrA0BwjeAv2M8WLQBtcy+SD6fNsmnB3AlBLrgTtVW1c2QN4bVWLATaIS60J2Du5y1TiJgjSBvFVZgTmwCU+dAZFoPxGEEs8nyHC9Bwe2GvEJv2WXZb0vjdyFT4Cxk3e/kIqlOGoVLwwPevpYHT+00T+hWwXDf4AJAOUqWcDhbwAAAAASUVORK5CYII=)!important}#toast-container>.toast-error{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHOSURBVEhLrZa/SgNBEMZzh0WKCClSCKaIYOED+AAKeQQLG8HWztLCImBrYadgIdY+gIKNYkBFSwu7CAoqCgkkoGBI/E28PdbLZmeDLgzZzcx83/zZ2SSXC1j9fr+I1Hq93g2yxH4iwM1vkoBWAdxCmpzTxfkN2RcyZNaHFIkSo10+8kgxkXIURV5HGxTmFuc75B2RfQkpxHG8aAgaAFa0tAHqYFfQ7Iwe2yhODk8+J4C7yAoRTWI3w/4klGRgR4lO7Rpn9+gvMyWp+uxFh8+H+ARlgN1nJuJuQAYvNkEnwGFck18Er4q3egEc/oO+mhLdKgRyhdNFiacC0rlOCbhNVz4H9FnAYgDBvU3QIioZlJFLJtsoHYRDfiZoUyIxqCtRpVlANq0EU4dApjrtgezPFad5S19Wgjkc0hNVnuF4HjVA6C7QrSIbylB+oZe3aHgBsqlNqKYH48jXyJKMuAbiyVJ8KzaB3eRc0pg9VwQ4niFryI68qiOi3AbjwdsfnAtk0bCjTLJKr6mrD9g8iq/S/B81hguOMlQTnVyG40wAcjnmgsCNESDrjme7wfftP4P7SP4N3CJZdvzoNyGq2c/HWOXJGsvVg+RA/k2MC/wN6I2YA2Pt8GkAAAAASUVORK5CYII=)!important}#toast-container>.toast-success{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADsSURBVEhLY2AYBfQMgf///3P8+/evAIgvA/FsIF+BavYDDWMBGroaSMMBiE8VC7AZDrIFaMFnii3AZTjUgsUUWUDA8OdAH6iQbQEhw4HyGsPEcKBXBIC4ARhex4G4BsjmweU1soIFaGg/WtoFZRIZdEvIMhxkCCjXIVsATV6gFGACs4Rsw0EGgIIH3QJYJgHSARQZDrWAB+jawzgs+Q2UO49D7jnRSRGoEFRILcdmEMWGI0cm0JJ2QpYA1RDvcmzJEWhABhD/pqrL0S0CWuABKgnRki9lLseS7g2AlqwHWQSKH4oKLrILpRGhEQCw2LiRUIa4lwAAAABJRU5ErkJggg==)!important}#toast-container>.toast-warning{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGYSURBVEhL5ZSvTsNQFMbXZGICMYGYmJhAQIJAICYQPAACiSDB8AiICQQJT4CqQEwgJvYASAQCiZiYmJhAIBATCARJy+9rTsldd8sKu1M0+dLb057v6/lbq/2rK0mS/TRNj9cWNAKPYIJII7gIxCcQ51cvqID+GIEX8ASG4B1bK5gIZFeQfoJdEXOfgX4QAQg7kH2A65yQ87lyxb27sggkAzAuFhbbg1K2kgCkB1bVwyIR9m2L7PRPIhDUIXgGtyKw575yz3lTNs6X4JXnjV+LKM/m3MydnTbtOKIjtz6VhCBq4vSm3ncdrD2lk0VgUXSVKjVDJXJzijW1RQdsU7F77He8u68koNZTz8Oz5yGa6J3H3lZ0xYgXBK2QymlWWA+RWnYhskLBv2vmE+hBMCtbA7KX5drWyRT/2JsqZ2IvfB9Y4bWDNMFbJRFmC9E74SoS0CqulwjkC0+5bpcV1CZ8NMej4pjy0U+doDQsGyo1hzVJttIjhQ7GnBtRFN1UarUlH8F3xict+HY07rEzoUGPlWcjRFRr4/gChZgc3ZL2d8oAAAAASUVORK5CYII=)!important}#toast-container.toast-bottom-center>div,#toast-container.toast-top-center>div{width:300px;margin-left:auto;margin-right:auto}#toast-container.toast-bottom-full-width>div,#toast-container.toast-top-full-width>div{width:96%;margin-left:auto;margin-right:auto}.toast{background-color:#030303}.toast-success{background-color:#51A351}.toast-error{background-color:#BD362F}.toast-info{background-color:#2F96B4}.toast-warning{background-color:#F89406}.toast-progress{position:absolute;left:0;bottom:0;height:4px;background-color:#000;opacity:.4;-ms-filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=40);filter:alpha(opacity=40)}@media all and (max-width:240px){#toast-container>div{padding:8px 8px 8px 50px;width:11em}#toast-container>div.rtl{padding:8px 50px 8px 8px}#toast-container .toast-close-button{right:-.2em;top:-.2em}#toast-container .rtl .toast-close-button{left:-.2em;right:.2em}}@media all and (min-width:241px) and (max-width:480px){#toast-container>div{padding:8px 8px 8px 50px;width:18em}#toast-container>div.rtl{padding:8px 50px 8px 8px}#toast-container .toast-close-button{right:-.2em;top:-.2em}#toast-container .rtl .toast-close-button{left:-.2em;right:.2em}}@media all and (min-width:481px) and (max-width:768px){#toast-container>div{padding:15px 15px 15px 50px;width:25em}#toast-container>div.rtl{padding:15px 50px 15px 15px}}

lib/config.js

@@ -1,7 +1,7 @@
 export const config = {
-  overpassBase: '//overpass-cfn-production.tilestream.net/api/interpreter',
-  osmBase: '//www.openstreetmap.org/api/0.6/',
+  overpassBase: 'https://overpass.maptime.in/api/interpreter',
+  osmBase: 'https://www.openstreetmap.org/api/0.6/',
   mapboxAccessToken:
     'pk.eyJ1IjoicmFzYWd5IiwiYSI6ImNpejVrMjc4eTAwNGczM2thNWozYnJ1OHkifQ.yFRr3Sd39TJiwEguQpIkWQ',
-  S3_URL: '//s3.amazonaws.com/mapbox/real-changesets/production/'
+  S3_URL: 'https://s3.amazonaws.com/mapbox/real-changesets/production/'
 };

lib/index.js

@@ -2,4 +2,4 @@ export { config } from './config';
 export { getChangeset } from './getChangeset';
 export { query } from './query';
 export { propsDiff } from './propsDiff';
-export { render } from './render';
+export { render, getMapInstance, getGL } from './render';

lib/map.js

@@ -614,15 +614,31 @@ export class Map {
   }
 
   renderMap(baseLayer, result) {
+    if (!result) {
+      if (!this.result) return;
+      result = this.result;
+    } else {
+      this.result = result;
+    }
     var bounds = getBounds(result.changeset.bbox);
-    this.result = result;
     if (this.map) {
       if (!this.mapLoaded) {
         this.queue.push([result, bounds]); // TOFIX use variable instead of array
+        this.result = result;
         return;
       }
-      this.addMapSource(result, bounds);
-      this.map.fitBounds(bounds, { linear: true, padding: 200 });
+
+      if (baseLayer && this.oldBaseLayer !== baseLayer) {
+        this.map.setStyle(baseLayer);
+        this.baseLayerData = [result, bounds];
+        this.oldBaseLayer = baseLayer;
+      } else {
+        this.oldBaseLayer = baseLayer;
+        this.addMapSource(result, bounds);
+        this.map.fitBounds(bounds, { linear: true, padding: 200 });
+        this.result = result;
+        clearDiff();
+      }
 
       // why not re attach on('click')
       // if the map is still mounted
@@ -639,7 +655,17 @@ export class Map {
       dragRotate: false,
       touchZoomRotate: false
     });
-
+    this.map.on('styledata', () => {
+      if (!this.baseLayerData) return;
+      console.log('style event fired 2');
+      var bounds = this.baseLayerData[1];
+      var result = this.baseLayerData[0];
+      this.baseLayerData = null;
+      this.map.fitBounds(bounds, { linear: true, padding: 200 });
+      this.addMapSource(result, bounds);
+      this.addMapLayers();
+      cmap.emit('load');
+    });
     this.map.on('load', () => {
       this.mapLoaded = true;
       if (this.queue.length > 0) {

lib/query.js

@@ -21,7 +21,7 @@ export function query(changesetID) {
       var uid = cs.uid.textContent;
       var user = cs.user.textContent;
       var from = moment(cs.created_at.textContent, 'YYYY-MM-DDTHH:mm:ss\\Z')
-        .subtract('seconds', 1)
+        .subtract(1, 'seconds')
         .format('YYYY-MM-DDTHH:mm:ss\\Z');
       var to = cs.closed_at ? cs.closed_at.textContent : null;
       var left = cs.min_lon ? cs.min_lon.textContent : -180;

lib/render.js

@@ -28,7 +28,7 @@ export function render(container, changesetId, options) {
   }
 
   if (options.data) {
-    _render(container, changesetId, options.data);
+    _render(container, changesetId, options.data, options.disableSidebar);
   } else {
     getChangeset(changesetId, options.overpassBase)
       .then(result => _render(container, changesetId, result))
@@ -39,9 +39,15 @@ export function render(container, changesetId, options) {
 
   return cmap;
 }
+export function getMapInstance() {
+  return map;
+}
+export function getGL() {
+  return mapboxgl;
+}
 
-function _render(container, changesetId, result) {
-  renderHTML(container, changesetId, result);
+function _render(container, changesetId, result, disableSidebar) {
+  renderHTML(container, changesetId, result, disableSidebar);
 
   container.classList.remove('cmap-loading');
 
@@ -66,7 +72,7 @@ function _render(container, changesetId, result) {
 }
 
 // Sets initial markup for info box and map container
-function renderHTML(container, changesetId, result) {
+function renderHTML(container, changesetId, result, disableSidebar) {
   var info;
   if (document.getElementById('seat')) {
     info = document.getElementById('seat');
@@ -97,28 +103,30 @@ function renderHTML(container, changesetId, result) {
           style={{ display: 'none' }}
         />
       </div>
-      <Sidebar
-        result={result}
-        changesetId={changesetId}
-        filterLayers={map.filterLayers}
-        toggleLayer={function(e) {
-          var layer = e.target.value;
-          if (layer === 'satellite') {
-            map.renderMap(
-              'mapbox://styles/rasagy/cizp6lsah00ct2snu6gi3p16q',
-              result
-            );
-          }
-
-          if (layer === 'dark') {
-            map.renderMap('mapbox://styles/mapbox/dark-v9', result);
-          }
-
-          if (layer === 'streets') {
-            map.renderMap('mapbox://styles/mapbox/streets-v9', result);
-          }
-        }}
-      />
+      {!disableSidebar && (
+        <Sidebar
+          result={result}
+          changesetId={changesetId}
+          filterLayers={map.filterLayers}
+          toggleLayer={function(e) {
+            var layer = e.target.value;
+            if (layer === 'satellite') {
+              map.renderMap(
+                'mapbox://styles/rasagy/cizp6lsah00ct2snu6gi3p16q',
+                result
+              );
+            }
+
+            if (layer === 'dark') {
+              map.renderMap('mapbox://styles/mapbox/dark-v9', result);
+            }
+
+            if (layer === 'streets') {
+              map.renderMap('mapbox://styles/mapbox/streets-v9', result);
+            }
+          }}
+        />
+      )}
     </div>,
     info
   );

package.json

@@ -1,6 +1,6 @@
 {
   "name": "changeset-map",
-  "version": "0.9.0",
+  "version": "1.1.0",
   "description": "",
   "main": "dist/bundle.js",
   "scripts": {
@@ -14,15 +14,19 @@
   },
   "author": "",
   "license": "ISC",
+  "peerDependencies": {
+    "react": "^15.5.4",
+    "react-dom": "^15.5.4"
+  },
   "dependencies": {
     "@turf/bbox-polygon": "^4.3.0",
     "@turf/helpers": "^4.3.0",
     "mapbox-gl": "^0.37.0",
+    "global": "^4.3.2",
     "moment": "^2.18.1",
     "osm-adiff-parser-saxjs": "^1.0.0",
-    "react": "^15.5.4",
-    "react-dom": "^15.5.4",
     "real-changesets-parser": "^1.2.3",
+    "rollup-plugin-uglify": "^2.0.1",
     "sax": "^1.2.2",
     "xhr": "^2.4.0"
   },
@@ -40,7 +44,7 @@
     "lint-staged": "^3.4.1",
     "prettier": "^1.3.1",
     "prettier-eslint-cli": "^3.4.3",
-    "rollup": "^0.41.6",
+    "rollup": "^0.42.0",
     "rollup-plugin-babel": "^2.7.1",
     "rollup-plugin-butternut": "^0.1.0",
     "rollup-plugin-commonjs": "^8.0.2",

rollup.plugin.config.js

@@ -6,7 +6,6 @@ import builtins from 'rollup-plugin-node-builtins';
 import globals from 'rollup-plugin-node-globals';
 import eslint from 'rollup-plugin-eslint';
 import sizes from 'rollup-plugin-sizes';
-import uglify from 'rollup-plugin-uglify';
 export default {
   entry: 'lib/index.js',
   dest: 'dist/bundle.js',