Merge pull request #167 from osmlab/release/v1.3.0

Release/v1.3.0

Author: willemarcel

CHANGELOG.md

@@ -1,8 +1,13 @@
-### Change Log
+# Change Log
 
 Log of changes since the 1.1.0 version
 
-# 1.2.0
+#### 1.3.0
+
+* Update mapbox-gl-js to 0.4.3
+* Update @turf/helpers and @turf/bbox-polygon to 5.1.5
+
+#### 1.2.0
 
 * Link the id of the old version changeset to OSMCha
 * Add section 'Tags added, updated, deleted'

lib/helpers.js

@@ -1,9 +1,7 @@
 import mapboxgl from 'mapbox-gl';
-import turfHelpers from '@turf/helpers';
+import { featureCollection } from '@turf/helpers';
 import turfBboxPolygon from '@turf/bbox-polygon';
 
-const featureCollection = turfHelpers.featureCollection;
-
 export function getBounds(bbox) {
   var left = +bbox.left,
     right = +bbox.right,

lib/render.js

@@ -1,5 +1,5 @@
 import mapboxgl from 'mapbox-gl';
-import { EventEmitter as events } from 'events';
+import { EventEmitter as Events } from 'events';
 import { render as reactDOM } from 'react-dom';
 import React from 'react';
 
@@ -9,7 +9,7 @@ import { Map as GlMap } from './map';
 //filterLayers, renderMap, selectFeature, clearFeature
 import { config } from './config';
 
-export const cmap = new events();
+export const cmap = new Events();
 
 let map;
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "changeset-map",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "",
   "main": "dist/bundle.js",
   "scripts": {
@@ -19,10 +19,10 @@
     "react-dom": "^15.5.4"
   },
   "dependencies": {
-    "@turf/bbox-polygon": "^4.3.0",
-    "@turf/helpers": "^4.3.0",
-    "mapbox-gl": "^0.37.0",
+    "@turf/bbox-polygon": "^5.1.5",
+    "@turf/helpers": "^5.1.5",
     "global": "^4.3.2",
+    "mapbox-gl": "^0.43.0",
     "moment": "^2.18.1",
     "osm-adiff-parser-saxjs": "^1.0.0",
     "real-changesets-parser": "^1.2.3",

public/css/mapbox-gl.css

@@ -9,7 +9,6 @@
     <div id='map'></div>
     <script defer src="./bundle.js"></script>
     <link rel="stylesheet" type="text/css" href="./css/reset.css" />
-    <link rel="stylesheet" type="text/css" href="./css/mapbox-gl.css" />
     <link rel="stylesheet" type="text/css" href="./css/style.css" />
 </body>
 
@@ -23,6 +22,7 @@
     <meta name='viewport' content='initial-scale=1,maximum-scale=1,user-scalable=no' />
     <title>Changeset Map</title>
 
+    <link rel="stylesheet" type="text/css" href="css/mapbox-gl.css" />
     <link href='css/style.css' rel='stylesheet' />
 
     <style>
@@ -63,4 +63,4 @@
     <script src='bundle.js'></script>
 </body>
 
-</html>
+</html>