Skip to content

Commit 0d46d4d

Browse files
Zack LaVergnembrzakovicbhouselnickpleshavanreece
authored
Rebase sidewalk_v1_preview onto main (#276)
* Move CrossEditableZoom event firing. It should happen after projection is transformed. * Bump versions * Switch to Mapillary API v4 * Fix traffic sign rendering and geometry conversion * Remove debugging code * Update locale file * Removing redundant @mapbox/geojson-rewind dep pkg * Remove unused map feature title * Bring map map feature tooltips * Add missing mapillary map feature classes * Update translation file * Bing imagery - Ensure freshness * bingImagery strict n param. Fallback url tempalate to latest * minor revert catch log * some bing imagery docs comments * typo * Add aws_deploy npm action to build workflow (#229) * Add aws_deploy npm action to build workflow Added the scripts/aws_deploy.py script which will run at the end of github builds and push stuff up to s3, so that you can easily get builds to reviewers or anyone else without issue. Needs to have some secrets set up on github to work, documentation is at the top of the python script. * Hopefully more verbose logging when amazon fails * DO NOT MERGE: Adding hook for this branch to test on github * Better capture failure cases of aws calls * Going with the middle spam level for logging * Replace Rollup with Esbuild. (#246) * Add new esbuild-based quickstart directive. * Get the esbuild legacy build working, save for issues with NSI. * Upgrade several dependencies, bump minimum node version to 12 - country-coder (closes #249) - location-conflation (closes #248) - osm-community-index (closes #250) - name-suggestion-index * Bump marked from 2.0.7 to 2.1.2 Bumps [marked](https://github.com/markedjs/marked) from 2.0.7 to 2.1.2. - [Release notes](https://github.com/markedjs/marked/releases) - [Changelog](https://github.com/markedjs/marked/blob/master/release.config.js) - [Commits](markedjs/marked@v2.0.7...v2.1.2) --- updated-dependencies: - dependency-name: marked dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Add the es5 directive back. * Get dev builds working once again, normal builds still slightly wonky. * Get some sort of legacy build working by converting requires() to import statements. * Fix target for esbuild legacy build * Move build all directive to use esbuild. * Add visualizer capability and build directive. * Remove rollup from dependency list completely! Co-authored-by: Bryan Housel <bhousel@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Remove special case for push to deploy_with_action This was just used during development * Clean up log, and add link to build result * One too many slashes * Is this simple conditional good enough? * Better syntax? * Now with correct syntax * Bump osm-community-index from 5.0.1 to 5.1.0 Bumps [osm-community-index](https://github.com/osmlab/osm-community-index) from 5.0.1 to 5.1.0. - [Release notes](https://github.com/osmlab/osm-community-index/releases) - [Changelog](https://github.com/osmlab/osm-community-index/blob/main/CHANGELOG.md) - [Commits](osmlab/osm-community-index@v5.0.1...v5.1.0) --- updated-dependencies: - dependency-name: osm-community-index dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump osm-community-index from 5.0.1 to 5.1.0 * If locationSet is missing `include`, default to worldwide include openstreetmap/iD#8305 (comment) * pacify eslint, fix merge goof in map.js * Build sourcemap too * Use pagination to fetch all the esri datasets (closes #257) * Bump object-inspect from 1.10.3 to 1.11.0 Bumps [object-inspect](https://github.com/inspect-js/object-inspect) from 1.10.3 to 1.11.0. - [Release notes](https://github.com/inspect-js/object-inspect/releases) - [Commits](inspect-js/object-inspect@v1.10.3...v1.11.0) --- updated-dependencies: - dependency-name: object-inspect dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * gitignore esbuild.json It changes on every build and is only use to rebuild the stats * Bump osm-community-index to 5.1.1 * Modernize more scripts (convert require to import) * npm run imagery * npm run translations * rapid-v1.1.5 * Set z-index of absolutely positioned layers under supersurface Each of these has their own internal stacking context * npm run translations * Fix link * Math/extent conversion (#272) * Bump version to newest id-sdk release. * Convert geoExtent to id-sdk/Extent. Most tests working. * Fix remaining tests. * Remove geo modules no longer in use. * Revert "Fix remaining tests." This reverts commit 7ba89ce. * Fix a number of instances of extents being used as raw tuples. * Woops- converted zoom/pan functionality that interacts with d3. NOT a candidate for Extent() conversion. * Fix roads/ways not appearing in the map, also fix a crossing ways test problem. * Fix an issue with the measurement panel not setting its extent correctly. * fix usages of Extend.extend() because it no longer modifies the extent in-place. * Fix copy / paste bug that falsely claimed everything had an extent of +/- Infinity. * add service module for querying streetview suggestions (#192) * Show suggestion images and viewfield icon * fix PR comments * hightlight images and viewfields on hover * Sort images by increasing longitude, so that the left-rightness of images matches the flow of the map points as we scan left->right. * Add image strip as separate component (still quite buggy). Fix the two-way binding between image fields and images in the strip so that hover/select highlights correctly. * Fix the image filmstrip so that it is properly shut off / redisplayed as the user hovers over / moves off a sidewalk. * Fix bug that was selecting the wrong service when we selected a sidewalk suggestion. * Get image strip working with Bryan's help. * Fix sorting of images by longitude. * Improve styling of the image strip, and add 'enlarge on mouse hover' interaction. * style suggested sidewalks * Parse crosswalk data * remove console.log statement * Fix debug messages that shouldn't have been checked in. * Fix issue that was causing too many viewfield nodes to appear. * fix hovering issues * Fix some linter errors. * Make 5 images not require a scrollbar in the image strip, even when one is zoomed. * Fix images to all have the same height, not the same width. * Fix code drift issues that had occurred in main. Co-authored-by: Milos Brzakovic (E-Search) <mbrzakovic@microsoft.com> Co-authored-by: Bryan Housel <bhousel@gmail.com> Co-authored-by: Nikola Pleša <nikolaplesa@fb.com> Co-authored-by: Milos Brzakovic <78906108+mbrzakovic@users.noreply.github.com> Co-authored-by: Danny Krause <vanreece@gmail.com> Co-authored-by: Ben Clark <bennyc@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Xiaoming Gao <mkobie@gmail.com> Co-authored-by: Amol Vasant Khadilkar <amolk@fb.com> Co-authored-by: Benjamin Clark <clarkben@fb.com>
1 parent e8af9ca commit 0d46d4d

File tree

203 files changed

+2701
-1624
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

203 files changed

+2701
-1624
lines changed

.github/workflows/build.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,13 @@ jobs:
2525
node-version: ${{ matrix.node-version }}
2626
- run: npm install
2727
- run: npm run all
28-
- run: npm run test
28+
- run: npm run test
29+
- run: npm run aws_deploy
30+
env:
31+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
32+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
33+
AWS_DEFAULT_REGION: us-west-2
34+
RAPID_S3_BUCKET_NAME: world.ai.rapid
35+
RAPID_WEB_ROOT: https://mapwith.ai
36+
NODE_VERSION: ${{ matrix.node-version }}
37+
if: ${{ matrix.node-version == '16.x' }}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ transifex.auth
1212
/dist/*.js
1313
/dist/*.css
1414
/dist/*.map
15+
/dist/esbuild.json
1516
/dist/data/
1617
/dist/img/*.svg
1718
/dist/locales/en.min.json

.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
node-options="--no-warnings --experimental-json-modules"

CHANGELOG.md

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# What's New
22

3-
Thanks to all our contributors, users, and the many people that make RapiD possible! :heart:
3+
Thanks to all our contributors, users, and the many people that make RapiD possible! ❤️
44

55
The RapiD map editor is an open source project. You can submit bug reports, help out,
66
or learn more by visiting our project page on GitHub: :octocat: https://github.com/facebookincubator/RapiD
77

8-
If you love RapiD, please star our project on GitHub to show your support! :star:
8+
If you love RapiD, please star our project on GitHub to show your support! ⭐️
99

10-
_Breaking developer changes, which may affect downstream projects or sites that embed RapiD, are marked with a_ :warning:
10+
_Breaking developer changes, which may affect downstream projects or sites that embed RapiD, are marked with a_ ⚠️
1111

1212
<!--
1313
# A.B.C
@@ -37,6 +37,35 @@ _Breaking developer changes, which may affect downstream projects or sites that
3737
[@xxxx]: https://github.com/xxxx
3838
-->
3939

40+
# [1.1.5](https://github.com/facebookincubator/RapiD/releases/tag/rapid-v1.1.5)
41+
##### 2021-Jul-13
42+
#### :tada: Updates
43+
* Name Suggestion Index v6.0
44+
* OSM Community Index v5.1
45+
* D3.js v7.0
46+
* Mapillary API and Mapillary-JS Viewer v4.0 ([#233], [#236])
47+
* Add new duplicate way validation ([#220])
48+
49+
#### :hammer: Development
50+
* Replace rollup with esbuild for much faster project builds ([#246])
51+
52+
#### :bug: Bugfixes
53+
* Remove artificial limit of 100 on Esri Datasets ([#257], [#265])
54+
* Ensure freshness of Bing Imagery ([iD#8570])
55+
* If locationSet is missing include, default to worldwide include ([iD#bfb36d5])
56+
* Fix bug in walkthrough ([#234])
57+
58+
[#220]: https://github.com/facebookincubator/RapiD/issues/220
59+
[#233]: https://github.com/facebookincubator/RapiD/issues/233
60+
[#234]: https://github.com/facebookincubator/RapiD/issues/234
61+
[#236]: https://github.com/facebookincubator/RapiD/issues/236
62+
[#246]: https://github.com/facebookincubator/RapiD/issues/246
63+
[#257]: https://github.com/facebookincubator/RapiD/issues/257
64+
[#265]: https://github.com/facebookincubator/RapiD/issues/265
65+
[iD#8570]: https://github.com/openstreetmap/iD/issues/8570
66+
[iD#bfb36d5]: https://github.com/openstreetmap/iD/pull/8305/commits/bfb36d572d35271f1a77227d776ebddc7f232ac3
67+
68+
4069
# [1.1.4](https://github.com/facebookincubator/RapiD/releases/tag/rapid-v1.1.4)
4170
##### 2021-May-14
4271
#### :tada: Updates

babel.config.json

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,22 @@
22
"presets": [
33
[
44
"@babel/preset-env", {
5-
"useBuiltIns": "usage",
6-
"corejs": 3,
7-
"modules": false
5+
"useBuiltIns": "entry",
6+
"corejs": 3,
7+
"modules": false,
8+
"targets": {
9+
"chrome": "58",
10+
"ie": 11
11+
}
812
}
913
],
1014
"@babel/preset-react"
1115
],
16+
"plugins": [
17+
"inline-json-import",
18+
["@babel/transform-runtime", {
19+
"regenerator": true
20+
}]
21+
],
1222
"compact": false
1323
}

config/esbuild.config.legacy.js

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
import esbuild from 'esbuild';
2+
import babel from 'esbuild-plugin-babel';
3+
4+
esbuild
5+
.build({
6+
entryPoints: ['./modules/id.js'],
7+
bundle: true,
8+
outfile: 'dist/iD.legacy.js',
9+
metafile: true,
10+
plugins: [babel({
11+
filter: /.*/,
12+
namespace: '',
13+
babelHelpers: 'bundled',
14+
// avoid circular dependencies due to `useBuiltIns: usage` option
15+
exclude: [/\/core-js\//],
16+
sourceType: 'unambiguous',
17+
})],
18+
target: ['es5']
19+
})
20+
.catch(() => process.exit(1));

css/80_app.css

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4146,8 +4146,15 @@ img.tile-debug {
41464146
bottom: 0;
41474147
}
41484148

4149+
4150+
.supersurface .layer.layer-background {
4151+
z-index: 1;
4152+
}
4153+
.supersurface .layer.layer-overlay {
4154+
z-index: 2;
4155+
}
41494156
.supersurface .layer.layer-data {
4150-
z-index: 30; /* above imagery, overlays */
4157+
z-index: 3;
41514158
}
41524159

41534160
/* Map-In-Map

data/core.yaml

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1426,11 +1426,27 @@ en:
14261426
title: "Map Features"
14271427
tooltip: "Map features from Mapillary"
14281428
construction:
1429+
barrier:
1430+
temporary: temporary barrier
14291431
flat:
14301432
crosswalk_plain: plain crosswalk
1433+
driveway: driveway
14311434
marking:
14321435
discrete:
1433-
crosswalk_zebra: zebra crosswalk
1436+
arrow:
1437+
left: lane marking - arrow (left)
1438+
right: lane marking - arrow (right)
1439+
split_left_or_straight: lane marking - arrow (split left or straight)
1440+
split_right_or_straight: lane marking - arrow (split right or straight)
1441+
straight: lane marking - arrow (straight)
1442+
crosswalk_zebra: lane marking - crosswalk
1443+
give_way_row: lane marking - give way (row)
1444+
give_way_single: lane marking - give way (single)
1445+
other_marking: lane marking - other
1446+
stop_line: lane marking - stop line
1447+
symbol:
1448+
bicycle: lane marking - symbol (bicycle)
1449+
text: lane marking - text
14341450
object:
14351451
banner: banner
14361452
bench: bench
@@ -1439,15 +1455,24 @@ en:
14391455
catch_basin: catch basin
14401456
cctv_camera: CCTV camera
14411457
fire_hydrant: fire hydrant
1458+
junction_box: junction box
14421459
mailbox: mailbox
14431460
manhole: manhole
1461+
parking_meter: parking meter
14441462
phone_booth: phone booth
14451463
sign:
14461464
advertisement: advertisement
14471465
information: information sign
1466+
other: other sign
14481467
store: shop sign
1468+
traffic_sign:
1469+
back: traffic sign - back
1470+
direction_front: traffic sign - front
1471+
front: traffic sign - front
14491472
street_light: street light
14501473
support:
1474+
pole: pole
1475+
traffic_sign_frame: traffic sign frame
14511476
utility_pole: utility pole
14521477
traffic_cone: traffic cone
14531478
traffic_light:
@@ -1458,6 +1483,7 @@ en:
14581483
other: traffic light
14591484
pedestrians: pedestrian traffic light
14601485
trash_can: trash can
1486+
water_valve: water valve
14611487
mapillary:
14621488
title: Mapillary
14631489
signs:

0 commit comments

Comments
 (0)