CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-14 01:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add timeout so Name Road step will reveal properly

Browse Source 
(re: https://github.com/openstreetmap/iD/pull/3921#issuecomment-290959115)
This commit is contained in:
Bryan Housel
2017-04-02 20:12:30 -04:00
parent 5f627c858e
commit b923a6d8e0
3 changed files with 57 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
data/core.yaml
View File

@@ -862,7 +862,7 @@ en:
finish: "Continue drawing the line for the new road. Remember that you can drag and zoom the map if needed. When you are finished drawing, click on the last node again. **Finish drawing the road.**"
road: "**Select Road from the list**"
residential: "There are different types of roads, the most common of which is Residential. **Choose the Residential road type**"
describe: "**Name the road, then click the {button} button to close the feature editor.**"
describe: "**Name the road, then hit escape, return, or click the {button} button to close the feature editor.**"
restart: "The road needs to intersect {name}. Let's try again!"
wrong_preset: "You didn't select the Residential road type. **Click here to choose again**"
play: "You added a new road! Try drawing a few more lines, and see what other kinds of lines you can add to OpenStreetMap. **When you are ready to continue to the next chapter, click '{next}'.**"
@@ -874,16 +874,16 @@ en:
choose_building: "**Select Building from the list**"
choose_house: "There are many different types of buildings, but this one is clearly a house. If you're not sure of the type, it's OK to just pick the generic Building preset. **Choose the House building type**"
close: "**Hit escape, return, or click the {button} button to close the feature editor**"
rightclick: "**Right-click to select the building you created.**"
square: "The house that you just added will look even better with perfectly square corners. **Click on the {button} button to square the building shape.**"
rightclick_building: "**Right-click to select the building you created.**"
square_building: "The house that you just added will look even better with perfectly square corners. **Click on the {button} button to square the building shape.**"
done_square: "See how the corners of the building moved into place? Let's learn another useful trick."
add_tank: "Let's trace this circular storage tank. **Click the {button} Area button to add a new area.**"
start_tank: "Don't worry, you won't need to draw a perfect circle. Just draw an area inside the tank that touches its edge. **Click or press spacebar to place a starting node on the edge of the tank.**"
continue_tank: "Add a few more points around the edge. After you've added at least three points, finish the area by clicking on the starting node. **Continue tracing the tank.**"
search_tank: "**Search for '{name}'**"
choose_tank: "**Choose {name} from the list.**"
rightclick: "**Right-click to select the storage tank you created.**"
circle: "**Click on the {button} button to make the tank a circle.**"
rightclick_tank: "**Right-click to select the storage tank you created.**"
circle_tank: "**Click on the {button} button to make the tank a circle.**"
play: "Great Job! Try tracing a few more buildings. **When you are ready to continue to the next chapter, click '{next}'.**"
startediting:
title: "Start Editing"

72
dist/locales/en.json vendored
View File

@@ -637,34 +637,38 @@
"done": "done",
"ok": "OK",
"graph": {
"azaleamum_drive": "Azaleamum Drive",
"city_hall": "Three Rivers City Hall",
"fire_department": "Three Rivers Fire Department",
"memory_isle_park": "Memory Isle Park",
"riverwalk_trail": "Riverwalk Trail",
"w_michigan_ave": "West Michigan Avenue",
"e_michigan_ave": "East Michigan Avenue",
"spring_st": "Spring Street",
"scidmore_park": "Scidmore Park",
"petting_zoo": "Scidmore Park Petting Zoo",
"n_andrews_st": "North Andrews Street",
"s_andrews_st": "South Andrews Street",
"n_constantine_st": "North Constantine Street",
"s_constantine_st": "South Constantine Street",
"rocky_river": "Rocky River",
"railroad_dr": "Railroad Drive",
"conrail_rr": "Conrail Railroad",
"st_joseph_river": "Saint Joseph River",
"n_main_st": "North Main Street",
"s_main_st": "South Main Street",
"water_st": "Water Street",
"foster_st": "Foster Street",
"portage_river": "Portage River",
"flower_st": "Flower Street",
"elm_st": "Elm Street",
"walnut_st": "Walnut Street",
"morris_ave": "Morris Avenue",
"e_michigan_ave": "East Michigan Avenue",
"east_st": "East Street",
"portage_ave": "Portage Avenue"
"elm_st": "Elm Street",
"fire_department": "Three Rivers Fire Department",
"first_baptist_church": "First Baptist Church",
"flower_st": "Flower Street",
"foster_st": "Foster Street",
"memory_isle_park": "Memory Isle Park",
"millard_st": "Millard Street",
"morris_ave": "Morris Avenue",
"n_andrews_st": "North Andrews Street",
"n_constantine_st": "North Constantine Street",
"n_main_st": "North Main Street",
"petting_zoo": "Scidmore Park Petting Zoo",
"portage_ave": "Portage Avenue",
"portage_river": "Portage River",
"railroad_dr": "Railroad Drive",
"riverwalk_trail": "Riverwalk Trail",
"rocky_river": "Rocky River",
"s_andrews_st": "South Andrews Street",
"s_constantine_st": "South Constantine Street",
"s_main_st": "South Main Street",
"scidmore_park": "Scidmore Park",
"south_st": "South Street",
"spring_st": "Spring Street",
"st_joseph_river": "Saint Joseph River",
"w_michigan_ave": "West Michigan Avenue",
"walnut_st": "Walnut Street",
"water_st": "Water Street"
},
"welcome": {
"title": "Welcome",
@@ -720,13 +724,29 @@
"finish": "Continue drawing the line for the new road. Remember that you can drag and zoom the map if needed. When you are finished drawing, click on the last node again. **Finish drawing the road.**",
"road": "**Select Road from the list**",
"residential": "There are different types of roads, the most common of which is Residential. **Choose the Residential road type**",
"describe": "**Name the road, then click the {button} button to close the feature editor.**",
"describe": "**Name the road, then hit escape or click the {button} button to close the feature editor.**",
"restart": "The road needs to intersect {name}. Let's try again!",
"wrong_preset": "You didn't select the Residential road type. **Click here to choose again**",
"play": "You added a new road! Try drawing a few more lines, and see what other kinds of lines you can add to OpenStreetMap. **When you are ready to continue to the next chapter, click '{next}'.**"
},
"buildings": {
"title": "Buildings",
"add_building": "OpenStreetMap is the world's largest database of buildings. You can help improve this database by tracing buildings that aren't already mapped. **Click the {button} Area button to add a new area.**",
"start_building": "Let's add this house to the map by tracing its outline. Buildings should be traced around their footprint as accurately as possible. **Click or press spacebar to place a starting node on one of the corners of the building.**",
"continue_building": "Continue adding more nodes to trace the outline of the building. Remember that you can zoom in if you want to add more details. Finish the building shape by clicking on the starting node. **Continue tracing the building.**",
"choose_building": "**Select Building from the list**",
"choose_house": "There are many different types of buildings, but this one is clearly a house. If you're not sure of the type, it's OK to just pick the generic Building preset. **Choose the House building type**",
"close": "**Hit escape, return, or click the {button} button to close the feature editor**",
"rightclick_building": "**Right-click to select the building you created.**",
"square_building": "The house that you just added will look even better with perfectly square corners. **Click on the {button} button to square the building shape.**",
"done_square": "See how the corners of the building moved into place? Let's learn another useful trick.",
"add_tank": "Let's trace this circular storage tank. **Click the {button} Area button to add a new area.**",
"start_tank": "Don't worry, you won't need to draw a perfect circle. Just draw an area inside the tank that touches its edge. **Click or press spacebar to place a starting node on the edge of the tank.**",
"continue_tank": "Add a few more points around the edge. After you've added at least three points, finish the area by clicking on the starting node. **Continue tracing the tank.**",
"search_tank": "**Search for '{name}'**",
"choose_tank": "**Choose {name} from the list.**",
"rightclick_tank": "**Right-click to select the storage tank you created.**",
"circle_tank": "**Click on the {button} button to make the tank a circle.**",
"play": "Great Job! Try tracing a few more buildings. **When you are ready to continue to the next chapter, click '{next}'.**"
},
"startediting": {

10
modules/ui/intro/line.js
View File

@@ -272,9 +272,11 @@ export function uiIntroLine(context, reveal) {
continueTo(play);
});
reveal('.entity-editor-pane',
t('intro.lines.describe', { button: icon('#icon-apply', 'pre-text') })
);
timeout(function() {
reveal('.entity-editor-pane',
t('intro.lines.describe', { button: icon('#icon-apply', 'pre-text') })
);
}, 500);
function continueTo(nextStep) {
context.on('exit.intro', null);
@@ -285,7 +287,7 @@ export function uiIntroLine(context, reveal) {
function play() {
dispatch.call('done');
reveal('.intro-nav-wrap .chapter-buildings',
reveal('.intro-nav-wrap .chapter-building',
t('intro.lines.play', { next: t('intro.buildings.title') }), {
buttonText: t('intro.ok'),
buttonCallback: function() { reveal('#id-container'); }