iD Editor v1.9.2 merge #349
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
`hasHiddenConnections` was calling it for all features, inluding points and vertices, causing _childNodes to have a lot of unnecessary keys added to it.
possibly related to #2736, as a source of "Uncaught Error Entity xxxx not found" errors
(If hit accidently these can really get a user stuck)
…2736) Entity not found is caused by subtle bugs elsewhere in the iD code and should not prevent users from saving their work because it can't be thoroughly conflict checked.
v1.7.5 Conflicts: .jshintrc LICENSE Makefile README.md css/app.css data/core.yaml dist/locales/en.json index.html js/id/core/connection.js js/id/id.js js/id/modes/save.js js/id/ui.js js/id/ui/background.js js/id/ui/commit.js js/id/ui/info.js js/id/ui/map_in_map.js js/id/ui/raw_tag_editor.js js/id/ui/scale.js js/lib/d3.v3.js package.json
Conflicts: .gitignore CHANGELOG.md Makefile README.md css/app.css css/map.css data/data_dev.js data/operations-sprite.json index.html js/id/core/connection.js js/id/core/entity.js js/id/id.js js/id/modes/save.js js/id/modes/select.js js/id/renderer/background.js js/id/renderer/background_source.js js/id/renderer/map.js js/id/svg/tag_classes.js js/id/ui.js js/id/ui/background.js js/id/ui/commit.js js/id/ui/entity_editor.js js/id/ui/help.js js/id/ui/map_in_map.js js/id/ui/modes.js js/id/ui/preset/check.js js/id/ui/preset_icon.js js/id/ui/preset_list.js js/id/ui/radial_menu.js js/id/ui/raw_membership_editor.js js/id/ui/raw_tag_editor.js js/id/ui/sidebar.js js/id/ui/tag_reference.js package.json test/index.html test/spec/renderer/features.js
* CSS for Entity Editor * index.html fixes * Additions to iD.svg
* Changed info shortcut back to "I" from "⌘I"
* Can run TA while in review mode
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#139