Commit Graph

6506 Commits

Author SHA1 Message Date
Mikołaj "Natsuyasumi" Kuranowski
9ff18af45f Merge remote-tracking branch 'refs/remotes/openstreetmap/master' 2017-01-02 17:51:27 +01:00
Bryan Housel
6ca4b13304 Store view transform and selectedIDs w/history, and undo/redo them
(closes #2204)
2016-12-10 23:25:58 -05:00
Bryan Housel
dc5da7b480 Follow next vertex when deleting, add suppressMenu when vertex following 2016-12-09 12:11:24 -05:00
Bryan Housel
3abf1b5be8 Allow reselection of next vertex even if vertex has multiple parents 2016-12-09 11:57:26 -05:00
Bryan Housel
a55ab036aa Don't assume that all the ids in selectedIDs are valid
(This is becuse they might have been deleted in a delete operation
and we are immediately redrawing the results of that operation before
reselecting something else)
2016-12-09 11:46:22 -05:00
Bryan Housel
8a66b3d892 Don't enter iD.modeSelect without valid entities in selectedIDs 2016-12-09 11:32:14 -05:00
Bryan Housel
a3de3534c3 Don't reuse click handler in enter selection, set on update
(closes #3638)
2016-12-08 11:08:21 -05:00
Bryan Housel
1912251251 Add labels for vertices
(closes #2709)
2016-12-07 16:58:27 -05:00
Bryan Housel
6b18ea76ff Hide labels along selected ways, or near selected vertices
(closes #3636)
2016-12-07 15:38:14 -05:00
Bryan Housel
77b78a73ca Complete orphaned d3-zoom gestures that were preventing clicks
(closes #2151), (see also d3/d3-zoom#60, d3/d3-brush#18)

Intercept `mousedown` and check if there is an orphaned zoom gesture.
This can happen if a previous `mousedown` occurred without a `mouseup`.
If we detect this, dispatch `mouseup` to complete the orphaned gesture,
so that d3-zoom won't stop propagation of new `mousedown` events.
2016-12-06 16:54:42 -05:00
Bryan Housel
aa3c1c8431 All sources have id now, so compare by id
Fixes an issue where a source might not compare strictly equal e.g.:
1. custom imagery gets blacklisted and replaced with a
`rendererBackgroundSource.None()`
2. which doesn't strictly === the `rendererBackgroundSource.None()` on the
background pane switcher
3. so the radio button would not appear checked
2016-12-04 21:47:46 -05:00
Bryan Housel
a7ac44f6e8 Refactor imageryBlacklists so it can be called without triggering a GET
Previous code was problematic because we need the function to
to properly blacklist custom imagery passed in through the url hash,
before iD is completely initialized.  Triggering GET causes tests to
break because osm service testing has side effects :-/
2016-12-04 21:35:55 -05:00
Bryan Housel
c353684ad3 Add imagery blacklist tests to rendererBackground#baseLayerSource 2016-12-04 13:55:18 -05:00
Bryan Housel
b9888e45e4 Add imageryBlacklists function to get blacklists from OSM API
(for #3623)
2016-12-03 19:25:07 -05:00
Bryan Housel
1d7e2f76bd Check in example deploy.sh script 2016-12-02 10:45:03 -05:00
Bryan Housel
0c024698d1 Remove "covered" field from Bus Stop preset
(closes #3627)
2016-12-02 05:44:25 -05:00
Bryan Housel
1a31d6e3c6 Add note for Windows users about symbolic links 2016-12-01 22:29:19 -05:00
Bryan Housel
7edef9ef67 const with for-of not actually ok in all version of node 4 2016-12-01 21:52:35 -05:00
Bryan Housel
d955b3c626 Include shelljs as dependency (even though shx installs it) 2016-11-30 23:36:55 -05:00
Bryan Housel
2453c5c8b7 Eliminate symlinks in repository - shelljs/shx can make them
(closes #3545)
2016-11-30 17:06:33 -05:00
Bryan Housel
026450d8fd Bump shx 0.2.1 to fix issue w building on windows cygwyn/git bash shell 2016-11-30 14:56:58 -05:00
Bryan Housel
3f024d0b95 Replace hardcoded RTL list with detected language lookup from dataLocales 2016-11-28 00:12:50 -05:00
Bryan Housel
fc0b8a6a90 npm run translations 2016-11-27 23:56:39 -05:00
Bryan Housel
5494d0990a Pull RTL/LTR from Transifex
(closes #3489)
2016-11-27 23:56:17 -05:00
Bryan Housel
9e50af529b Adjust placeholders, labels.. add specific Surveillance Camera preset
* Having separate presets for Surveillance and Surveillance Camera means
we can show the camera related fields only if `surveillance:type=camera`
* Generally use Upper Case for labels and keep it short
* if list of values is really fixed, use options strings to make them translateable
* if list of values is not fixed, avoid adding placeholder, iD will fetch from taginfo
* Seems like value "ALPR" is preferred over "alpr"
2016-11-26 16:42:37 -05:00
Bryan Housel
d2432ad96a Merge branch 'preset/surveillance_extended_fields_camera' of https://github.com/bkil/iD into bkil-preset/surveillance_extended_fields_camera 2016-11-26 16:11:42 -05:00
Bryan Housel
cd1ac6ea59 Merge pull request #3621 from samely/master
add presets to amenity=food_court and amenity=crematorium
2016-11-26 16:07:25 -05:00
samely
c51c170797 add presets to amenity=food_court and amenity=crematorium 2016-11-26 13:03:08 -05:00
greenkeeperio-bot
cc648d8eba chore(package): update mocha to version 3.2.0
https://greenkeeper.io/
2016-11-26 00:21:38 -05:00
Eduard Popov
e9b0fa1dd6 fix connection.js to osm.js in FAQ 2016-11-26 00:19:41 -05:00
greenkeeperio-bot
b34013be67 chore(package): update eslint to version 3.11.0
https://greenkeeper.io/
2016-11-26 00:19:03 -05:00
Bryan Housel
67407c5081 Add node 7 to Travis build matrix 2016-11-23 10:02:12 -05:00
greenkeeperio-bot
c1cb675ce1 chore(package): update mocha-phantomjs-core to version 2.1.0
https://greenkeeper.io/
2016-11-23 09:58:25 -05:00
Bryan Housel
80d9cd6c72 Use traditional interpolation for zoom interpolator, not fly-out-in 2016-11-23 09:55:16 -05:00
greenkeeperio-bot
708a7cee40 chore(package): update d3 to version 4.4.0
https://greenkeeper.io/
2016-11-23 09:17:13 -05:00
greenkeeperio-bot
1b329d4e6f chore(package): update rollup to version 0.36.4
https://greenkeeper.io/
2016-11-23 09:13:42 -05:00
bkil
c4140bf2b5 fix up generated files via npm run build 2016-11-23 13:45:26 +01:00
bkil
c87ff327e1 data/presets/presets/man_made/surveillance.json: add some common fields 2016-11-23 13:40:47 +01:00
bkil
ad1b6998a4 data/presets/fields: add surveillance and camera related properties
https://wiki.openstreetmap.org/wiki/Tag:man_made%3Dsurveillance
https://wiki.openstreetmap.org/wiki/Proposed_features/Extended_tags_for_Key:Surveillance

These are mandatory tags:
* `surveillance`
* `surveillance:type`

I do not feel that the following are important, they can be selected from
the drop down manually anyway:
* `operator`
* `name`

These tags are well established:

* `camera:type` has 15k users
* `camera:mount` has 13k users
* `surveillance:zone` has 17k users (mostly traffic is noted)
* `camera:direction` has 6k users

These tags are in the proposed status:
* `contact:webcam` usage is only starting
* `height`

People used various tags instead of `contact:webcam` in the past
because of it being a recent tag, and/or a lack of knowledge or being
mislead by the dropdown.

Thus it is difficult to quote an exact number, but by using complex
regexp queries, I could find thousands of usages for webcam links
when properly combining man_made/surveillance/camera and various
(sometimes invalid) keywords in the key or value part of a tag:

* `website`
* `image`
* `uri`, `url`, `link`, `http`, `contact`
* `stream`
* `webcam`
2016-11-23 13:40:41 +01:00
Bryan Housel
27228c3019 Remove checkboxes, remove escaped markdown chars 2016-11-22 16:15:29 -05:00
Eduard Popov
817d3528f1 improve release algorithm
Escape '*' characters for correct display in Markdown.
Do not add force dist/locales/*.json files, that are not ignored in master branch.
2016-11-22 10:48:26 +10:00
Bryan Housel
90210f4932 Add maxheight field and add it to many highway presets
(closes #3605)
2016-11-21 11:11:13 -05:00
Bryan Housel
6e86c235b1 Tag should be fence_type not fence
(re #3602)
2016-11-20 23:32:29 -05:00
Bryan Housel
8fe66fa65d Add fence and wall type fields, add height field to some barriers
(closes #3602)
2016-11-20 21:04:33 -05:00
Bryan Housel
e3212e6ea4 Add presets for Aquarium, Resort, Dance Hall
(closes #3579)
2016-11-19 01:08:29 -05:00
Bryan Housel
9dfdf09d0e Add internet_access, outdoor_seating to presets that might use them 2016-11-18 14:11:10 -05:00
bkil
94a546ca63 data/presets/presets/highway/traffic_mirror.json: new
https://wiki.openstreetmap.org/wiki/Tag:highway%3Dtraffic_mirror
2016-11-18 13:28:42 -05:00
bkil
504ed75e49 data/presets/presets/man_made/surveillance.json: add search terms 2016-11-18 13:27:46 -05:00
bkil
a0128e81fb data/presets/presets/amenity/pub.json: add search terms 2016-11-18 13:26:22 -05:00
bkil
2b44f9ed59 data/presets/presets/amenity/hunting_stand.json: add search terms 2016-11-18 13:25:57 -05:00