Commit Graph

11328 Commits

Author SHA1 Message Date
Quincy Morgan
eec2f6748d Merge pull request #6266 from westnordost/patch-9
deprecate shop=jewellery
2019-04-29 15:16:57 -07:00
Quincy Morgan
9837af3ba9 Add Building Height and Building Levels field to some POI presets if they are buildings (close #6238) 2019-04-29 15:13:25 -07:00
Quincy Morgan
9b37461ea6 Rename "SSID (Network Name)" field to "Wifi Network Name" to be clearer to most people 2019-04-29 14:58:59 -07:00
Tobias Zwick
494dac0225 deprecate shop=jewellery 2019-04-29 23:58:27 +02:00
Quincy Morgan
957735bb70 Make Internet Access Fee field appear immediately after setting Internet Access in more cases (close #6265)
Add internet_access fields to moreFields of more presets (because the network is everywhere!)
2019-04-29 14:51:16 -07:00
Bryan Housel
80b99eb7cb Get rid of extremely slow sibling selector affecting combo performance
(closes #6249)

I don't even think it affects anything anymore.
2019-04-29 17:26:40 -04:00
Bryan Housel
fceb1a86f7 Merge pull request #6245 from openstreetmap/d3-v5
d3 v5
2019-04-29 15:46:08 -04:00
Bryan Housel
e981cd5dd5 Switch mapillary and openstreetcam tests to work async
- can't reliably use sinon.spy to tell whether a thing has been called,
  so we listen for events instead and check server.requests()
- make sure to request the next page before dispatching `loadedImages` so
  we can `server.respond()` to the request in the event handler if we want to
- also moves `localeDateString` in the openstreetcam service from parsing
  code to display code, because it's very slow (we can just do this for the
  images we look at, instead of all images we fetch)
2019-04-29 15:31:08 -04:00
Quincy Morgan
4f03a2d34b Simplify self-service laundry preset filename 2019-04-29 10:57:55 -07:00
Quincy Morgan
ca8d92edd3 Capitalize Service in shop/laundry/self_service name
Add derived data for previous merge
2019-04-29 10:48:49 -07:00
Quincy Morgan
6bf88e5342 Merge pull request #6260 from westnordost/presets-laundry
Added laundromat preset and self_service field
2019-04-29 10:47:17 -07:00
Quincy Morgan
56898b1843 Merge branch 'master' into unsquare-buildings-autofix 2019-04-29 10:44:37 -07:00
Tobias Zwick
f21a259144 capitalize Self-Service 2019-04-29 19:40:09 +02:00
Quincy Morgan
aff50def81 Don't recommend public_transport:version for public_transport=stop_area (close #6250) 2019-04-29 10:38:58 -07:00
Quincy Morgan
2eaa6d6ae7 Merge branch 'master' of https://github.com/openstreetmap/iD 2019-04-29 10:23:26 -07:00
Quincy Morgan
94b0376ccf Add building fields to more building presets (re: #6238) 2019-04-29 10:21:31 -07:00
Bryan Housel
af31b84b1d Keep track of whether requests have been processed
This lets us call `respond` multiple times, which is useful for the
tests which fetch data in pages.
2019-04-29 13:03:01 -04:00
Bryan Housel
4459087840 Merge pull request #6261 from westnordost/patch-8
Mention reference in the readme for presets
2019-04-29 09:36:10 -04:00
Bryan Housel
8a31673ac6 Merge pull request #6257 from westnordost/patch-6
Add castle tower preset
2019-04-29 09:34:57 -04:00
Bryan Housel
ac91cdee97 Merge pull request #6254 from westnordost/presets-hangar
Add preset for building=hangar
2019-04-29 09:34:40 -04:00
Bryan Housel
5a660f5e28 Merge pull request #6253 from westnordost/presets-general-store
Add shop=general for general store
2019-04-29 09:34:19 -04:00
Tobias Zwick
3b82c4e3c1 capitalize names 2019-04-29 00:16:32 +02:00
Tobias Zwick
28444a4b25 Capitalize Village Shop 2019-04-29 00:13:22 +02:00
Tobias Zwick
7a2b4618e5 Capitalize Tower 2019-04-29 00:12:55 +02:00
Tobias Zwick
554c6cd9c8 Capitalize Hangar Building 2019-04-29 00:12:17 +02:00
Tobias Zwick
8bab697ca9 Capitalize General Store 2019-04-29 00:11:30 +02:00
Bryan Housel
7b10385e85 Merge pull request #6258 from westnordost/patch-7
Add tourism information terminal preset
2019-04-28 18:10:47 -04:00
Bryan Housel
510820750b Merge pull request #6256 from westnordost/presets-beacon
add man_made=beacon preset
2019-04-28 18:08:55 -04:00
Bryan Housel
e4c091d312 Merge pull request #6255 from westnordost/presets-dyke
Add man_made=dyke preset
2019-04-28 18:08:17 -04:00
Bryan Housel
d9e9722660 Merge pull request #6252 from westnordost/patch-4
Deprecate amenity/leisure=club/social_club
2019-04-28 18:01:36 -04:00
Bryan Housel
5f8c51ad01 Merge pull request #6251 from westnordost/patch-3
Deprecate amenity=dancing_school
2019-04-28 18:00:14 -04:00
Tobias Zwick
cebf05823e Mention reference in the readme for presets 2019-04-28 23:52:30 +02:00
Tobias Zwick
28ab9194f2 Add self_service field to presets 2019-04-28 23:35:53 +02:00
Tobias Zwick
812271e5ea add preset for coin laundry 2019-04-28 23:24:38 +02:00
Tobias Zwick
773c35b2cb Add tourism information terminal preset
Used 5k+ times, see https://wiki.openstreetmap.org/wiki/Tag:information%3Dterminal
2019-04-28 22:45:33 +02:00
Tobias Zwick
1a890c3860 Add castle tower preset
See https://wiki.openstreetmap.org/wiki/Tag%3Atower%3Atype%3Ddefensive , used 3800+ times
2019-04-28 22:28:24 +02:00
Tobias Zwick
6cd015901b add man_made=beacon preset 2019-04-28 22:00:18 +02:00
Tobias Zwick
77a6174d36 add missing "," 2019-04-28 21:42:27 +02:00
Tobias Zwick
98827f6017 Add man_made=dyke preset 2019-04-28 21:41:44 +02:00
Tobias Zwick
54612a168e Add shop=general for general store 2019-04-28 18:56:07 +02:00
Tobias Zwick
d3df05b9c2 Add preset for building=hangar
Make the hangar building preset have a lower matchScore so that first the aeroway=hangar is found
2019-04-28 18:43:56 +02:00
Tobias Zwick
b5e87cadfb Deprecate amenity/leisure=club/social_club
See https://wiki.openstreetmap.org/wiki/Key%3Aclub , club is documented as a top-level tag
2019-04-28 18:10:12 +02:00
Tobias Zwick
5a17379c9c Deprecate amenity=dancing_school
Also deprecated in the wiki and a replacement is available, see https://wiki.openstreetmap.org/wiki/Tag%3Aamenity%3Ddancing_school
2019-04-28 17:52:51 +02:00
Quincy Morgan
20d75a5821 Deprecate lawyer=notary (re: #6248) 2019-04-27 17:31:29 -07:00
Quincy Morgan
061f61e7dd Add derived data for j-bar preset 2019-04-27 17:07:57 -07:00
Quincy Morgan
c812d11c03 Deprecate "todo" and "TODO" tags in favor of "fixme" (re: #6214) 2019-04-27 17:07:39 -07:00
Bryan Housel
452eb8b43a Bump timeouts on streetlevel loadimage-type tests
This isn't perfect but might avoid spurious test failures.
2019-04-27 17:41:58 -04:00
Bryan Housel
c9c5284996 Merge pull request #6246 from westnordost/patch-2
Add aerialway=j-bar to presets
2019-04-27 14:22:41 -04:00
Tobias Zwick
bdb5add982 Add aerialway=j-bar to presets 2019-04-27 15:36:14 +02:00
Bryan Housel
d0452e6be4 Convert fakeServer tests to use fakeFetch
- Many text expects are now wrapped in setTimeout, as the fetch
  promises settle async now.
- This makes the tests somewhat brittle, and we should maybe consider
  reworking some of them. For example it is very hard to perform
  a test like `expect(spy).to.have.not.been.called` in an async way.
  (We could instead inspect the fakeServer requests() to know this.)
- Also includes some trickery for osm.js, which uses d3-xml (fetch)
  now for unauthenticated calls and osmauth (xhr) for authenticated calls
2019-04-26 22:29:48 -04:00