Skip to content

Commit

Permalink
Merge pull request #167 from osmlab/release/v1.3.0
Browse files Browse the repository at this point in the history
Release/v1.3.0
  • Loading branch information
willemarcel authored Jan 4, 2018
2 parents 397c098 + 92282ed commit 4059c5a
Show file tree
Hide file tree
Showing 7 changed files with 575 additions and 321 deletions.
9 changes: 7 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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'
4 changes: 1 addition & 3 deletions lib/helpers.js
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
4 changes: 2 additions & 2 deletions lib/render.js
Original file line number Diff line number Diff line change
@@ -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';

Expand All @@ -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;

Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "changeset-map",
"version": "1.2.0",
"version": "1.3.0",
"description": "",
"main": "dist/bundle.js",
"scripts": {
Expand All @@ -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",
Expand Down
549 changes: 328 additions & 221 deletions public/css/mapbox-gl.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -63,4 +63,4 @@
<script src='bundle.js'></script>
</body>

</html>
</html>
Loading

0 comments on commit 4059c5a

Please sign in to comment.