Commit e4acc97e authored by Adrien Pavie's avatar Adrien Pavie

Fixing conflicts

parents 052c92fe 2f3912b0
js/id/start.js
js/id/end.js
......@@ -4,11 +4,11 @@
"dot-notation": 2,
"eqeqeq": [2, "smart"],
"indent": [0, 4],
"keyword-spacing": 2,
"linebreak-style": [2, "unix"],
"no-caller": 2,
"no-catch-shadow": 2,
"no-div-regex": 2,
"no-empty-label": 2,
"no-extend-native": 2,
"no-extra-bind": 2,
"no-floating-decimal": 2,
......@@ -45,7 +45,6 @@
"no-use-before-define": [0, "nofunc"],
"semi": [2, "always"],
"semi-spacing": 2,
"space-return-throw-case": 2,
"space-unary-ops": 2,
"wrap-regex": 0,
"quotes": [2, "single"]
......@@ -53,17 +52,10 @@
"globals": {
"d3": false,
"iD": false,
"_": false,
"t": false,
"bootstrap": false,
"Diff3": false,
"rbush": false,
"JXON": false,
"osmAuth": false,
"sexagesimal": false,
"toGeoJSON": false,
"marked": false,
"Mapillary": false,
},
......
......@@ -6,3 +6,4 @@ dist/*.js
dist/*.css
dist/img/*.svg
data/data.js
js/lib/id/*.js
language: node_js
node_js:
- "5.11"
sudo: false
before_install:
# https://github.com/travis-ci/travis-ci/issues/3225
- mkdir travis-phantomjs
- wget https://github.com/Medium/phantomjs/releases/download/v2.1.1/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2
- tar -xvf $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis-phantomjs
- export PATH=$PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH
before_script: make
before_script:
- make clean
- make
:warning: = Breaking change, may affect downstream projects or sites that embed iD.
## 1.9.7
##### Jul 16, 2016
* Treat features on `addr:interpolation` lines as points, not vertices (#3241)
* Add ref field to `amenity=post_box` preset (#3232, thanks @boothym)
* Fix crash calling `_.all` when moving multiple features (#3155, thanks @tyrasd)
* Add `emergency=defibrillator` preset (#3202, thanks @ramyaragupathy)
* Add `man_made=bridge` preset (#3183, thanks @SatyaSudheer)
* Switch from `sloped_curb=*` to `kerb=*` (#3210)
* Rename "Chemist" preset label to "Drugstore" for en_US (#3201)
* Exclude imagery sources more than 20 years old (#3190)
* Add `highway=give_way` preset for yield signs
* Add stars, rooms, internet access fee fields for hotel presets (#3144, thanks @homersimpsons)
* Add stop type, direction forward/backward fields for stop sign preset (#3115, thanks @homersimpsons)
* When setting form's background color also set field color (#3100 thanks @jonnybarnes)
* Add sidewalk preset to Path presets category (#3181, thanks @willemarcel)
* Fix mph/kph imperial units test in maxspeed (#3156)
* Fix d3 bug causing map to translate far away when zooming under heavy load (#2773, thanks @kepta)
## 1.9.6
##### Jun 7, 2016
* Embed interactive Mapillary JS viewer instead of static image (#3128, thanks @kepta, @peterneubauer)
......
ISC License
Copyright (c) 2015, iD Contributors
Permission to use, copy, modify, and/or distribute this software for any
......
......@@ -41,6 +41,14 @@ BUILDJS_SOURCES = \
$(BUILDJS_TARGETS): $(BUILDJS_SOURCES) build.js
node build.js
MODULE_TARGETS = \
js/lib/id/index.js \
js/lib/id/index.js: $(shell find modules -type f)
@rm -f $@
node_modules/.bin/rollup -c rollup.config.js -f umd -n iD modules/index.js --no-strict -o $@
dist/iD.js: \
js/lib/bootstrap-tooltip.js \
js/lib/d3.v3.js \
......@@ -53,211 +61,9 @@ dist/iD.js: \
js/lib/d3.trigger.js \
js/lib/d3.curtain.js \
js/lib/d3.value.js \
js/lib/diff3.js \
js/lib/jxon.js \
js/lib/lodash.js \
js/lib/osmauth.js \
js/lib/rbush.js \
js/lib/sexagesimal.js \
js/lib/togeojson.js \
js/lib/marked.js \
js/id/start.js \
js/id/id.js \
js/id/services.js \
js/id/services/mapillary.js \
js/id/services/nominatim.js \
js/id/services/taginfo.js \
js/id/services/wikidata.js \
js/id/services/wikipedia.js \
js/id/util.js \
js/id/util/session_mutex.js \
js/id/util/suggest_names.js \
js/id/geo.js \
js/id/geo/extent.js \
js/id/geo/intersection.js \
js/id/geo/multipolygon.js \
js/id/geo/raw_mercator.js \
js/id/actions.js \
js/id/actions/add_entity.js \
js/id/actions/add_member.js \
js/id/actions/add_midpoint.js \
js/id/actions/add_vertex.js \
js/id/actions/change_member.js \
js/id/actions/change_preset.js \
js/id/actions/change_tags.js \
js/id/actions/circularize.js \
js/id/actions/connect.js \
js/id/actions/copy_entities.js \
js/id/actions/delete_member.js \
js/id/actions/delete_multiple.js \
js/id/actions/delete_node.js \
js/id/actions/delete_relation.js \
js/id/actions/delete_way.js \
js/id/actions/deprecate_tags.js \
js/id/actions/discard_tags.js \
js/id/actions/disconnect.js \
js/id/actions/join.js \
js/id/actions/merge.js \
js/id/actions/merge_polygon.js \
js/id/actions/merge_remote_changes.js \
js/id/actions/move.js \
js/id/actions/move_node.js \
js/id/actions/noop.js \
js/id/actions/orthogonalize.js \
js/id/actions/restrict_turn.js \
js/id/actions/reverse.js \
js/id/actions/revert.js \
js/id/actions/rotate_way.js \
js/id/actions/split.js \
js/id/actions/straighten.js \
js/id/actions/unrestrict_turn.js \
js/id/behavior.js \
js/id/behavior/add_way.js \
js/id/behavior/breathe.js \
js/id/behavior/copy.js \
js/id/behavior/drag.js \
js/id/behavior/draw.js \
js/id/behavior/draw_way.js \
js/id/behavior/edit.js \
js/id/behavior/hash.js \
js/id/behavior/hover.js \
js/id/behavior/lasso.js \
js/id/behavior/paste.js \
js/id/behavior/select.js \
js/id/behavior/tail.js \
js/id/modes.js \
js/id/modes/add_area.js \
js/id/modes/add_line.js \
js/id/modes/add_point.js \
js/id/modes/browse.js \
js/id/modes/drag_node.js \
js/id/modes/draw_area.js \
js/id/modes/draw_line.js \
js/id/modes/move.js \
js/id/modes/rotate_way.js \
js/id/modes/save.js \
js/id/modes/select.js \
js/id/operations.js \
js/id/operations/circularize.js \
js/id/operations/continue.js \
js/id/operations/delete.js \
js/id/operations/disconnect.js \
js/id/operations/merge.js \
js/id/operations/move.js \
js/id/operations/orthogonalize.js \
js/id/operations/reverse.js \
js/id/operations/rotate.js \
js/id/operations/split.js \
js/id/operations/straighten.js \
js/id/core/connection.js \
js/id/core/difference.js \
js/id/core/entity.js \
js/id/core/graph.js \
js/id/core/history.js \
js/id/core/node.js \
js/id/core/relation.js \
js/id/core/tags.js \
js/id/core/tree.js \
js/id/core/way.js \
js/id/renderer/background.js \
js/id/renderer/background_source.js \
js/id/renderer/features.js \
js/id/renderer/map.js \
js/id/renderer/tile_layer.js \
js/id/svg.js \
js/id/svg/areas.js \
js/id/svg/defs.js \
js/id/svg/gpx.js \
js/id/svg/icon.js \
js/id/svg/labels.js \
js/id/svg/layers.js \
js/id/svg/lines.js \
js/id/svg/mapillary_images.js \
js/id/svg/mapillary_signs.js \
js/id/svg/midpoints.js \
js/id/svg/osm.js \
js/id/svg/points.js \
js/id/svg/tag_classes.js \
js/id/svg/turns.js \
js/id/svg/vertices.js \
js/id/ui.js \
js/id/ui/account.js \
js/id/ui/attribution.js \
js/id/ui/background.js \
js/id/ui/cmd.js \
js/id/ui/commit.js \
js/id/ui/confirm.js \
js/id/ui/conflicts.js \
js/id/ui/contributors.js \
js/id/ui/disclosure.js \
js/id/ui/entity_editor.js \
js/id/ui/feature_info.js \
js/id/ui/feature_list.js \
js/id/ui/flash.js \
js/id/ui/full_screen.js \
js/id/ui/geolocate.js \
js/id/ui/help.js \
js/id/ui/info.js \
js/id/ui/inspector.js \
js/id/ui/intro.js \
js/id/ui/lasso.js \
js/id/ui/level.js \
js/id/ui/loading.js \
js/id/ui/map_data.js \
js/id/ui/map_in_map.js \
js/id/ui/modal.js \
js/id/ui/modes.js \
js/id/ui/notice.js \
js/id/ui/preset_icon.js \
js/id/ui/preset.js \
js/id/ui/preset_list.js \
js/id/ui/radial_menu.js \
js/id/ui/raw_member_editor.js \
js/id/ui/raw_membership_editor.js \
js/id/ui/raw_tag_editor.js \
js/id/ui/restore.js \
js/id/ui/save.js \
js/id/ui/scale.js \
js/id/ui/selection_list.js \
js/id/ui/sidebar.js \
js/id/ui/source_switch.js \
js/id/ui/spinner.js \
js/id/ui/splash.js \
js/id/ui/status.js \
js/id/ui/success.js \
js/id/ui/tag_reference.js \
js/id/ui/toggle.js \
js/id/ui/undo_redo.js \
js/id/ui/view_on_osm.js \
js/id/ui/zoom.js \
js/id/ui/preset/access.js \
js/id/ui/preset/address.js \
js/id/ui/preset/check.js \
js/id/ui/preset/combo.js \
js/id/ui/preset/cycleway.js \
js/id/ui/preset/input.js \
js/id/ui/preset/localized.js \
js/id/ui/preset/maxspeed.js \
js/id/ui/preset/radio.js \
js/id/ui/preset/restrictions.js \
js/id/ui/preset/textarea.js \
js/id/ui/preset/wikipedia.js \
js/id/ui/intro/area.js \
js/id/ui/intro/line.js \
js/id/ui/intro/navigation.js \
js/id/ui/intro/point.js \
js/id/ui/intro/start_editing.js \
js/id/presets.js \
js/id/presets/category.js \
js/id/presets/collection.js \
js/id/presets/field.js \
js/id/presets/preset.js \
js/id/validations.js \
js/id/validations/deprecated_tag.js \
js/id/validations/many_deletions.js \
js/id/validations/missing_tag.js \
js/id/validations/tag_suggests_area.js \
js/id/end.js \
$(MODULE_TARGETS) \
js/lib/locale.js \
data/introGraph.js
......@@ -278,9 +84,6 @@ node_modules/.install: package.json
npm install
touch node_modules/.install
clean:
rm -f $(BUILDJS_TARGETS) data/feature-icons.json dist/iD*.js dist/iD.css dist/img/*.svg
translations:
node data/update_locales
......@@ -320,3 +123,6 @@ d3:
lodash:
node_modules/.bin/lodash --development --output js/lib/lodash.js include="includes,toPairs,assign,bind,chunk,clone,compact,debounce,difference,each,every,extend,filter,find,first,forEach,forOwn,groupBy,indexOf,intersection,isEmpty,isEqual,isFunction,keys,last,map,omit,reject,some,throttle,union,uniq,values,without,flatten,value,chain,cloneDeep,merge,pick,reduce" exports="global,node"
clean:
rm -f $(BUILDJS_TARGETS) $(MODULE_TARGETS) data/feature-icons.json dist/iD*.js dist/iD.css dist/img/*.svg
......@@ -7,7 +7,10 @@
* It's intentionally simple. It lets you do the most basic tasks while
not breaking other people's data.
* It's focused on [indoor mapping](http://wiki.openstreetmap.org/wiki/Indoor_Mapping), making contributions easier.
* It supports modern browsers. Data is rendered with [d3.js](http://d3js.org/).
* It supports all popular modern desktop browsers: Chrome, Firefox, Safari,
Opera, Edge, and IE11.
* iD is not yet designed for mobile browsers, but this is something we hope to add!
* Data is rendered with [d3.js](http://d3js.org/).
## Live instance
......@@ -19,12 +22,12 @@
* If you see a bug not related to indoor features, you can report it in the [iD issue tracker](https://github.com/openstreetmap/iD/issues).
## Prerequisites
* [Node.js](http://nodejs.org/) version 0.10.0 or newer
* [PhantomJS](http://phantomjs.org/) version 2 or newer (for running tests)
* [Node.js](http://nodejs.org/) version 4 or newer
* Command line development tools (`make`, `git`, and a compiler) for your platform
* Ubuntu:
* `sudo apt-get install build-essential git`
* Mac OS X:
* macOS:
* Install [Xcode](https://developer.apple.com/xcode/) and run `xcode-select --install` from a command line
* Windows (Cygwin):
* Install [Git for Windows](https://git-scm.com/downloads)
......
......@@ -111,6 +111,11 @@ function suggestionsToPresets(presets) {
var tag = category.split('/'),
parent = presets[tag[0] + '/' + tag[1]];
if (!parent) {
console.log('WARN: no preset for suggestion = ' + tag);
return;
}
presets[category] = {
tags: parent.tags ? _.merge(tags, parent.tags) : tags,
name: name,
......@@ -239,7 +244,7 @@ fs.writeFileSync('data/presets/categories.json', JSON.stringify(categories, null
fs.writeFileSync('data/presets/fields.json', JSON.stringify(fields, null, 4));
fs.writeFileSync('data/presets/presets.json', JSON.stringify(presets, null, 4));
fs.writeFileSync('data/presets.yaml',
YAML.dump({en: {presets: translate}}, {sortKeys: sortKeys})
YAML.safeDump({en: {presets: translate}}, {sortKeys: sortKeys, lineWidth: -1})
.replace(/\'.*#\':/g, '#')
);
......
......@@ -159,6 +159,7 @@ input[type=url],
input[type=tel],
input[type=email] {
background-color: white;
color: #333;
border:1px solid #ccc;
padding:5px 10px;
height:30px;
......@@ -2188,7 +2189,7 @@ input.lvl-value:hover {
float:right;
margin-left: 20px;
margin-bottom: 20px;
padding-left: 5px
padding-left: 5px;
}
.help-wrap .toc li a,
......@@ -2342,7 +2343,6 @@ img.tile-removing {
/* Map-In-Map
------------------------------------------------------- */
.map-in-map {
position: absolute;
overflow: hidden;
......@@ -2368,8 +2368,8 @@ img.tile-removing {
user-select: none;
}
.map-in-map-svg,
.map-in-map-gpx {
.map-in-map-viewport,
.map-in-map-data {
top: 0;
left: 0;
overflow: hidden;
......@@ -2377,16 +2377,15 @@ img.tile-removing {
width: 100%;
}
.map-in-map-svg {
.map-in-map-viewport {
position: absolute;
}
.map-in-map-gpx {
.map-in-map-data {
position: relative;
z-index: 10;
}
.bbox,
.map-in-map-bbox {
fill: none;
stroke: rgba(255, 255, 0, 0.75);
......@@ -2398,6 +2397,45 @@ img.tile-removing {
stroke-width: 5;
}
/* Debug
------------------------------------------------------- */
.debug {
stroke: currentColor;
fill: none;
stroke-width: 2;
}
.map-in-map-data .debug {
stroke-width: 1;
}
.red { color: rgba(255, 0, 0, 0.75); }
.green { color: rgba(0, 255, 0, 0.75); }
.blue { color: rgba(0, 0, 255, 0.75); }
.yellow { color: rgba(255, 255, 0, 0.75); }
.cyan { color: rgba(0, 255, 255, 0.75); }
.magenta { color: rgba(255, 0, 255, 0.75); }
.orange { color: rgba(255, 153, 0, 0.75); }
.pink { color: rgba(255, 0, 153, 0.75); }
.purple { color: rgba(153, 0, 255, 0.75); }
.debug-legend {
position: absolute;
top: 70px;
right: 80px;
padding: 5px;
border-radius: 4px;
pointer-events: none;
}
.debug-legend-item {
padding-right: 5px;
}
.debug-legend-item:before {
content: "\25A0";
padding: 0 5px;
}
/* Info Box
------------------------------------------------------- */
.infobox {
......
This diff is collapsed.
This diff is collapsed.
......@@ -26,6 +26,7 @@
"gl",
"de",
"el",
"gu",
"hi",
"hu",
"is",
......@@ -37,6 +38,7 @@
"lv",
"lij",
"lt",
"ml",
"no",
"fa",
"pl",
......
This diff is collapsed.
This diff is collapsed.
......@@ -88,6 +88,9 @@
"name": "Path Features",
"icon": "category-path",
"members": [
"highway/pedestrian",
"footway/crosswalk",
"footway/sidewalk",
"highway/footway",
"highway/steps",
"highway/conveying_steps",
......@@ -193,30 +196,6 @@
"type/route"
]
},
"category-shop": {
"geometry": "point",
"name": "Shop Features",
"icon": "shop",
"members": [
"shop/convenience",
"shop/supermarket",
"shop/mall",
"shop/department_store",
"shop/clothes",
"shop/bakery",
"shop/kiosk",
"shop/doityourself",
"shop/butcher",
"shop/furniture",
"shop/shoes",
"shop/alcohol",
"shop/beauty",
"shop/books",
"shop/mobile_phone",
"shop/jewelry",
"shop"
]
},
"category-shop_area": {
"geometry": "area",
"name": "Shops",
......@@ -282,6 +261,30 @@
"information/price_checker"
]
},
"category-shop": {
"geometry": "point",
"name": "Shop Features",
"icon": "shop",
"members": [
"shop/convenience",
"shop/supermarket",
"shop/mall",
"shop/department_store",
"shop/clothes",
"shop/bakery",
"shop/kiosk",
"shop/doityourself",
"shop/butcher",
"shop/furniture",
"shop/shoes",
"shop/alcohol",
"shop/beauty",
"shop/books",
"shop/mobile_phone",
"shop/jewelry",
"shop"
]
},
"category-water-area": {
"geometry": "area",
"name": "Water Features",
......