CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-14 17:52:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,583 Commits 2 Branches 0 Tags
4971a204094de667a88d2fa8eaa8fbb99eb184f3
Commit Graph

1100 Commits

Author SHA1 Message Date
Bryan Housel
ef2b4271b7 Merge pull request #2809 from openstreetmap/conflicting-tags 
Disable joining ways with conflicting tags
 2015-10-20 23:06:35 -04:00
Bryan Housel
0aa899a580 Fix turn restrictions involving circular ways (closes #2807) 2015-10-20 22:52:39 -04:00
John Firebaugh
ecb9398d5c Disable joining ways with conflicting tags 2015-10-18 13:42:14 -07:00
John Firebaugh
0517f8e2b3 When reversing tags for joins, include "oneway" 2015-10-18 13:29:16 -07:00
Bryan Housel
66e8f78aa7 Prefer suggested capitalization over user value in combobox (closes #2791) 2015-10-17 23:17:17 -04:00
Bryan Housel
c592acb759 Improve autocompletion for raw tag editor (closes #2748) 
* Don't shorten the user's query
* Drop pouplar key threshold from 10000 to 5000
* Always show key if it has a wiki page (`d.in_wiki`)
 2015-09-27 22:39:41 -04:00
Bryan Housel
b365a2062c Handle multi-character keys in iD.ui.cmd (closes #2786) 2015-09-27 21:28:04 -04:00
Bryan Housel
dc9f29fd09 Use stricter regex for localized field key (closes #2658) 
Now it will no longer match `old_name`
 2015-09-18 10:22:39 -04:00
M1dgard
670cc3d81c Add test case for callback function returning false 2015-09-08 17:07:09 +02:00
Bryan Housel
522e593f11 Improvements to access field (closes #2763) 2015-09-08 00:03:34 -04:00
Martin Raifer
d7d3bb4cf8 update tests to reflect changes in dd32ec39 
(The version attribute of the osmChange XML should read `0.6`)
 2015-09-05 16:50:13 +02:00
Bryan Housel
701731485e Less strict polygon intersection test in findOuter (closes #2755) 2015-09-01 14:48:40 -04:00
Bryan Housel
7288806012 Add styling for ephemeral tags (closes #2740) 
includes various forms of:
 'proposed', 'construction', 'disused', 'abandoned', 'dismantled',
 'razed', 'demolished', 'obliterated'
 2015-07-28 17:18:16 -04:00
Bryan Housel
11c009ee70 Add bicycle=dismount access option (closes #2726) 2015-07-27 16:17:43 -04:00
Bryan Housel
bc7b78179b Merge pull request #2681 from frewsxcv/patch-1 
Use HTTPS if location protocol is HTTPS in iD.Connection
 2015-07-17 15:01:26 -04:00
Bryan Housel
58cb66f472 Add highway=corridor and universal level field 
For now, `highway=corridor`:
  * styled like highway=pedestrian
  * and matches 'paths' feature filter.

(closes #2687, closes #2218)
 2015-06-30 22:02:22 -04:00
Corey Farwell
56708858fb Use HTTPS if location protocol is HTTPS in iD.Connection 
Relevant to https://github.com/strava/iD/issues/5#issuecomment-109800372
 2015-06-27 14:06:58 -07:00
Bryan Housel
728036be51 Don't write unsavable changes to localStorage (closes #2705) 2015-06-20 12:21:29 -04:00
Bryan Housel
60fdb60a8a Refactor validations 2015-06-19 14:58:09 -04:00
Bryan Housel
f4d93c442e Add connection#loadEntityVersion to fetch specific version 2015-06-18 11:46:43 -04:00
John Firebaugh
f8a68c879f Adjust tree for force-rebased entities 
Previously, entities that already existed in the rtree prior to the rebase
option would end up duplicated in the tree afterward.

Fixes #2637
 2015-05-09 14:38:41 -07:00
Bryan Housel
7adb0ddbfb Smarter revert of new entities, more tests 
re: #2611, #537
 2015-04-29 22:47:07 -04:00
Bryan Housel
ca02cf4b96 Graph#revert accept id instead of entity ref 
trivial test cases (revert across create/update/delete) all pass
 2015-04-28 11:22:46 -04:00
Bryan Housel
587d1451be More tests for Graph#revert (reverting new things should remove them) 2015-04-27 12:02:59 -04:00
Bryan Housel
c10b83f28f iD.actions.Revert (see #537) 2015-04-26 01:08:31 -04:00
Bryan Housel
6b18066dd6 Graph#revert (see #537) 2015-04-26 01:07:48 -04:00
Bryan Housel
99d037e97f Better logic for adding area=yes (closes #2578) 
This fixes a few issues:

1. before: checked first key in applyTags and break loop, now: check all of them
(this was what caused `area=yes` to be added to 'branded' presets:
the first key is for these is `name` which isn't in areaKeys.)

2. add `area=yes` if user is drawing an area but the preset can be an
area or a line (e.g. `barrier=city_wall`)

3. remove `area=yes` when switching to another preset
 2015-04-22 17:04:18 -04:00
Olaf Veerman
89b354ddba Allow overzoom to be set on overlays 
The default behaviour is to overzoom overlays past their max
scaleExtent. When 'overzoom':false is defined in imagery.json,
the layer will disappear on the max scaleExtent.
 2015-03-26 12:04:54 -07:00
Bryan Housel
55c4fce55f Merge pull request #2516 from bhousel/zorrofix 
Avoid zorroing connected ways when moving a way
 2015-03-20 22:30:34 -04:00
Bryan Housel
c69fbf3e3d In copy/paste, use the graph that entities originally came from 
(fixes #2557)
 2015-03-18 10:08:36 -04:00
Bryan Housel
d216afd59f Map-in-Map overview 
* press 'M' to toggle
* shows current zoom-6
* with locator overlay and bounding box
 2015-03-16 00:23:22 -04:00
Bryan Housel
05ff86e5c2 Prevent no-match parent relations from breaking getMatches 
(e.g. a site relation with a fence in it)
Also, updated the test graph to contain one of these.
see https://github.com/openstreetmap/iD/pull/2554#issuecomment-78517442
 2015-03-12 13:59:48 -04:00
Bryan Housel
3308b5507b Feature Filtering: don't match multipolygon lines as 'others' 
(fixes #2548)

If the entity is a way that is a member of a parent relation,
use that parent relation's matches instead of matching 'other'
 2015-03-10 00:06:29 -04:00
Bryan Housel
2485d74d5b Use interpolated D3 zooming for zoomIn/zoomOut 2015-03-09 16:34:07 -04:00
Bryan Housel
1f0087d133 Merge pull request #2525 from openstreetmap/conflict-resolution 
Merge Conflict Resolution
 2015-03-05 19:49:15 -05:00
Bryan Housel
a7e67ccfd9 refactor Conflicts ui into its own component 2015-03-04 11:46:56 -05:00
Bryan Housel
c503b9f96c fill remoteGraph with loadMultiple, finally do proper undeletion 2015-03-03 23:43:37 -05:00
Bryan Housel
56449bc589 Pend some failing tests 
They should work but they don't.  No idea why.  PhantomJS issue?
 2015-03-03 21:06:28 -05:00
Bryan Housel
cb0e8ab66c Initial support for Multi Fetch GET 
It will also be much faster to fetch the remote entities in batches
rather than one at a time through LoadEntity.

One bonus/hazard with Multi Fetch GET is that it will get deleted entities
with `visible=false`, rather than returning a HTTP Status Code 410 (Gone).

This will be the only way that we can really do proper undeletion
(Incrementing the current version by 1 is not guaranteed to work.  And
if a way is moved, fetching way/full will tell us whether the childnodes
are part of the way, but not necessarily whether they exist or not.)

We must be careful never to merge deleted entities into the real graph.
e.g, a deleted node will not have a 'loc' attribute, so code that assumes
every node must have a `loc` will be broken.

So because deleted entities are very special, the output from `loadMultiple`
should only be used for conflict resolution for now.
 2015-03-03 20:54:09 -05:00
Bryan Housel
fc94e7775f more tests 2015-03-02 22:47:49 -05:00
Bryan Housel
e3139e250e improvements to iD.actions.MergeRemoteChanges 
* if remote entity is deleted, log to conflicts() array
* if remote tag was deleted, delete from tags (not set undefined)
* update tests..
 2015-03-02 13:07:24 -05:00
Bryan Housel
0730e0432b keep localGraph - UI can now flip between mine/theirs 2015-02-20 17:01:19 -05:00
Bryan Housel
ad8c381301 WIP: handle conflicting local tag deletion 
re: https://github.com/openstreetmap/iD/pull/2489#discussion-diff-22490581
 2015-02-20 12:43:47 -05:00
Bryan Housel
38b50a347e WIP: Fix tests, simplify mergeChildNodes 2015-02-17 22:10:47 -05:00
John Firebaugh
9aab74c187 Test; simplify 2015-02-12 10:24:40 -08:00
samanpwbb
d141827c3e Merge branch 'master' into conflict-resolution-ui 2015-02-06 19:08:50 -05:00
Bryan Housel
6d82ae4146 add iD.geo.Extent#contains 2015-02-06 13:56:51 -05:00
Bryan Housel
147e369c3b Add graph#overwrite (same as pop followed by perform) 
to remove some of the overhead in creating difference and dispatching
change event multiple times..
 2015-02-02 22:01:49 -05:00
Bryan Housel
cac0258baf Merge pull request #2498 from bhousel/copy-paste 
Copy paste map features with Cmd-C, Cmd-V
 2015-01-15 21:24:58 -05:00
Bryan Housel
ef2d6e75cf Add minzoom check to map.zoom() (closes #2499) 2015-01-13 23:09:19 -05:00