New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vector tile drawing for .mvt and .pbf format #5072

Merged
merged 97 commits into from Jul 9, 2018
Commits
Jump to file or symbol
Failed to load files and symbols.
+37,497 −15,077
Diff settings

Always

Just for now

View
@@ -1,5 +1,6 @@
.DS_Store
.esm-cache
.vscode/
/data/data.js
/dist/*.js
/dist/*.css
View
@@ -1,4 +1,6 @@
.DS_Store
.esm-cache
.vscode/
.travis.yml
/.tx/
/data/data.js
View
@@ -28,6 +28,67 @@ _Breaking changes, which may affect downstream projects or sites that embed iD,
[@xxxx]: https://github.com/xxxx
-->
# 2.9.2
##### Jun 28, 2018
#### :sparkles: Usability
* This release contains a few updates to the background imagery list
# 2.9.1
##### Jun 25, 2018
#### :sparkles: Usability
* Improve the resolution of Bing Streetside ([#5102], thanks [@jharpster], [@LorenMueller])
* Adjust viewer parameters to allow users to zoom in more
* Add checkbox to toggle between low resolution (faster) and high resolution (slower)
* Switch low zoom map style based on latitude (improves width of roads closer to equator) ([#5101])
* Don't zoom in so far when searching for a point ([#5099])
* `amenity=shelter` no longer assumed to be a building for rendering or feature filtering ([#5084])
[#5102]: https://github.com/openstreetmap/iD/issues/5102
[#5101]: https://github.com/openstreetmap/iD/issues/5101
[#5099]: https://github.com/openstreetmap/iD/issues/5099
[#5084]: https://github.com/openstreetmap/iD/issues/5084
[@jharpster]: https://github.com/jharpster
[@LorenMueller]: https://github.com/LorenMueller
#### :bug: Bugfixes
* Add `royal_cypher` to list of tags that allow capital letters ([#5109])
* Fix bug that caused '0' to be written into a numeric field when tabbing ([#5087])
[#5109]: https://github.com/openstreetmap/iD/issues/5109
[#5087]: https://github.com/openstreetmap/iD/issues/5087
#### :mortar_board: Walkthrough / Help
* Use "Esri World Imagery (Clarity)" imagery in the intro walkthrough
#### :rocket: Presets
* Add field `height` to `barrier=retaining_wall` preset ([#5113], thanks [@tordans])
* Add preset for `emergency=lifeguard` ([#4918])
* Add preset for `emergency=fire_alarm_box`
* Add `height`, `name` fields to `natural=cliff` preset, improve search terms ([#5095])
* Add booth field to telephone presets ([#5088])
* Add "road" and "street" as search terms for all road presets ([#5103])
* Add preset for `emergency=siren` ([#5100])
* Add a preset for `emergency=first_aid_kit` ([#5097])
* Add `indoor` and `ref` fields to `emergency=phone` preset
* Add `name` field to `highway=motorway_junction` preset ([#5090], [#5092], thanks [@vershwal])
* Add `building` and `bench` fields to `amenity=shelter` preset ([#5084])
[#5113]: https://github.com/openstreetmap/iD/issues/5113
[#5103]: https://github.com/openstreetmap/iD/issues/5103
[#5100]: https://github.com/openstreetmap/iD/issues/5100
[#5097]: https://github.com/openstreetmap/iD/issues/5097
[#5095]: https://github.com/openstreetmap/iD/issues/5095
[#5092]: https://github.com/openstreetmap/iD/issues/5092
[#5090]: https://github.com/openstreetmap/iD/issues/5090
[#5088]: https://github.com/openstreetmap/iD/issues/5088
[#5084]: https://github.com/openstreetmap/iD/issues/5084
[#4918]: https://github.com/openstreetmap/iD/issues/4918
[@tordans]: https://github.com/tordans
[@vershwal]: https://github.com/vershwal
# 2.9.0
##### Jun 14, 2018
View
@@ -2,13 +2,13 @@
const fs = require('fs');
const rollup = require('rollup');
const nodeResolve = require('rollup-plugin-node-resolve');
const commonjs = require('rollup-plugin-commonjs');
const includePaths = require('rollup-plugin-includepaths');
const nodeResolve = require('rollup-plugin-node-resolve');
const json = require('rollup-plugin-json');
const colors = require('colors/safe');
module.exports = function buildSrc() {
var cache;
var building = false;
return function () {
if (building) return;
@@ -26,18 +26,19 @@ module.exports = function buildSrc() {
.rollup({
input: './modules/id.js',
plugins: [
includePaths( {
paths: ['node_modules/d3/node_modules'] // npm2 or windows
}),
nodeResolve({
module: true,
main: true,
browser: false
}),
commonjs(),
json( { indent: '' })
],
cache: cache
json({ indent: '' })
]
})
.then(function (bundle) {
cache = bundle;
return bundle.write({
format: 'iife',
file: 'dist/iD.js',
@@ -51,7 +52,6 @@ module.exports = function buildSrc() {
})
.catch(function (err) {
building = false;
cache = undefined;
console.error(err);
process.exit(1);
});
View
@@ -318,3 +318,32 @@ text.gpxlabel-halo {
stroke-miterlimit: 1;
}
/* MVT Paths */
.layer-mvt {
pointer-events: none;
}
path.mvt {
stroke: #ff26d4;
stroke-width: 2;
fill: none;
}
text.mvtlabel-halo,
text.mvtlabel {
font-size: 10px;
font-weight: bold;
dominant-baseline: middle;
}
text.mvtlabel {
fill: #ff26d4;
}
text.mvtlabel-halo {
opacity: 0.7;
stroke: #000;
stroke-width: 5px;
stroke-miterlimit: 1;
}
View
@@ -211,17 +211,14 @@ path.casing.tag-status {
/* Buildings */
path.stroke.tag-building,
path.stroke.tag-amenity-shelter {
path.stroke.tag-building {
stroke: rgb(224, 110, 95);
}
path.fill.tag-building,
path.fill.tag-amenity-shelter {
path.fill.tag-building {
stroke: rgba(224, 110, 95, 0.3);
fill: rgba(224, 110, 95, 0.3);
}
.preset-icon-fill-area.tag-building,
.preset-icon-fill-area.tag-amenity-shelter {
.preset-icon-fill-area.tag-building {
border-color: rgb(224, 110, 95);
background-color: rgba(224, 110, 95, 0.3);
}
@@ -263,4 +260,4 @@ path.stroke.tag-man_made-pier {
stroke-width: 1;
stroke-linecap: butt;
stroke-dasharray: 3, 3;
}
}
View
@@ -188,6 +188,21 @@
background-repeat: no-repeat no-repeat;
}
label.streetside-hires {
float: left;
padding: 0 10px;
cursor: pointer;
}
.streetside-hires span {
margin-top: 2px;
}
.streetside-hires input[type="checkbox"] {
float: left;
width: 12px;
height: 12px;
margin: 0 5px;
}
/* Mapillary viewer */
#mly .domRenderer .TagSymbol {
View
@@ -2521,6 +2521,10 @@ div.full-screen > button:hover {
transform: rotateY(180deg);
}
[dir='rtl'] .list-item-mvt-browse svg {
transform: rotateY(180deg);
}
/* make sure tooltip fits in map-control panel */
/* if too wide, placement will be wrong the first time it displays */
.layer-list li.best .tooltip-inner {
View
@@ -585,14 +585,20 @@ en:
cannot_zoom: "Cannot zoom out further in current mode."
full_screen: Toggle Full Screen
gpx:
local_layer: "Local file"
local_layer: "Add a GPX"
drag_drop: "Drag and drop a .gpx, .geojson or .kml file on the page, or click the button to the right to browse"
zoom: "Zoom to layer"
browse: "Browse for a file"
mvt:
local_layer: "Add a MVT"
drag_drop: "Drag and drop a .mvt or .pbf file on the page, or click the button to the right to browse"
zoom: "Zoom to layer"
browse: "Browse for a file"
streetside:
tooltip: "Streetside photos from Microsoft"
title: "Photo Overlay (Bing Streetside)"
report: Report a privacy concern with this image
hires: "High resolution"
mapillary_images:
tooltip: "Street-level photos from Mapillary"
title: "Photo Overlay (Mapillary)"
Oops, something went wrong.
ProTip! Use n and p to navigate between commits in a pull request.