Remove road routes, update names, make all lanes localizable

This commit is contained in:
Bryan Housel
2017-04-05 17:01:19 -04:00
parent 912d565fc3
commit 500dbfa054
5 changed files with 791 additions and 1976 deletions
+114 -32
View File
@@ -780,38 +780,120 @@ en:
done: done
ok: OK
graph:
azaleamum_drive: Azaleamum Drive
city_hall: Three Rivers City Hall
conrail_rr: Conrail Railroad
e_michigan_ave: East Michigan Avenue
east_st: East Street
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
city: Three Rivers
state: MI
postcode: "49093"
name:
1st-avenue: 1st Avenue
2nd-avenue: 2nd Avenue
4th-avenue: 4th Avenue
5th-avenue: 5th Avenue
6th-avenue: 6th Avenue
6th-street: 6th Street
7th-avenue: 7th Avenue
8th-avenue: 8th Avenue
9th-avenue: 9th Avenue
10th-avenue: 10th Avenue
11th-avenue: 11th Avenue
access-point-employment: Access Point Employment
adams-street: Adams Street
andrews-elementary-school: Andrews Elementary School
andrews-street: Andrews Street
armitage-street: Armitage Street
barrows-school: Barrows School
battle-street: Battle Street
bennett-street: Bennett Street
bowman-park: Bowman Park
collins-drive: Collins Drive
conrail-railroad: Conrail Railroad
conservation-park: Conservation Park
constantine-street: Constantine Street
cushman-street: Cushman Street
dollar-tree: Dollar Tree
douglas-avenue: Douglas Avenue
east-street: East Street
elm-street: Elm Street
flower-street: Flower Street
foster-street: Foster Street
french-street: French Street
garden-street: Garden Street
gem-pawnbroker: Gem Pawnbroker
golden-finch-framing: Golden Finch Framing
grant-avenue: Grant Avenue
hoffman-pond: Hoffman Pond
hoffman-street: Hoffman Street
hook-avenue: Hook Avenue
jefferson-street: Jefferson Street
kelsey-street: Kelsey Street
lafayette-park: LaFayette Park
las-coffee-cafe: L.A.'s Coffee Cafe
lincoln-avenue: Lincoln Avenue
lowrys-books: Lowry's Books
lynns-garage: Lynn's Garage
main-street-barbell: Main Street Barbell
main-street-cafe: Main Street Cafe
main-street-fitness: Main Street Fitness
main-street: Main Street
maple-street: Maple Street
marina-park: Marina Park
market-street: Market Street
memory-isle-park: Memory Isle Park
memory-isle: Memory Isle
michigan-avenue: Michigan Avenue
middle-street: Middle Street
millard-street: Millard Street
moore-street: Moore Street
morris-avenue: Morris Avenue
mural-mall: Mural Mall
paisanos-bar-and-grill: Paisano's Bar and Grill
paisley-emporium: Paisley Emporium
paparazzi-tattoo: Paparazzi Tattoo
pealer-street: Pealer Street
pine-river-road: Pine River Road
pine-street: Pine Street
pizza-hut: Pizza Hut
portage-avenue: Portage Avenue
portage-river: Portage River
preferred-insurance-services: Preferred Insurance Services
railroad-drive: Railroad Drive
raisin-river-road: Raisin River Road
river-city-appliance: River City Appliance
river-drive: River Drive
river-road: River Road
river-street: River Street
riverside-cemetery: Riverside Cemetery
riverwalk-trail: Riverwalk Trail
riviera-theatre: Riviera Theatre
rocky-river: Rocky River
sable-river-road: Sable River Road
saint-joseph-river: Saint Joseph River
scidmore-park-petting-zoo: Scidmore Park Petting Zoo
scidmore-park: Scidmore Park
scouter-park: Scouter Park
sherwin-williams: Sherwin-Williams
shiawassee-river-road: Shiawassee River Road
south-street: South Street
southern-michigan-bank: Southern Michigan Bank
spring-street: Spring Street
sturgeon-river-road: Sturgeon River Road
three-rivers-city-hall: Three Rivers City Hall
three-rivers-elementary-school: Three Rivers Elementary School
three-rivers-fire-department: Three Rivers Fire Department
three-rivers-high-school: Three Rivers High School
three-rivers-middle-school: Three Rivers Middle School
three-rivers-post-office: Three Rivers Post Office
three-rivers-public-library: Three Rivers Public Library
three-rivers: Three Rivers
unique-jewelry: Unique Jewelry
walnut-street: Walnut Street
washington-street: Washington Street
water-street: Water Street
west-street: West Street
wheeler-street: Wheeler Street
william-towing: William Towing
willow-drive: Willow Drive
wood-street: Wood Street
world-fare: World Fare
welcome:
title: "Welcome"
welcome: "Welcome! This walkthrough will teach you the basics of editing on OpenStreetMap."
+553 -1903
View File
File diff suppressed because it is too large Load Diff
+116 -33
View File
@@ -637,38 +637,121 @@
"done": "done",
"ok": "OK",
"graph": {
"azaleamum_drive": "Azaleamum Drive",
"city_hall": "Three Rivers City Hall",
"conrail_rr": "Conrail Railroad",
"e_michigan_ave": "East Michigan Avenue",
"east_st": "East Street",
"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"
"city": "Three Rivers",
"state": "MI",
"postcode": "49093",
"name": {
"1st-avenue": "1st Avenue",
"2nd-avenue": "2nd Avenue",
"4th-avenue": "4th Avenue",
"5th-avenue": "5th Avenue",
"6th-avenue": "6th Avenue",
"6th-street": "6th Street",
"7th-avenue": "7th Avenue",
"8th-avenue": "8th Avenue",
"9th-avenue": "9th Avenue",
"10th-avenue": "10th Avenue",
"11th-avenue": "11th Avenue",
"access-point-employment": "Access Point Employment",
"adams-street": "Adams Street",
"andrews-elementary-school": "Andrews Elementary School",
"andrews-street": "Andrews Street",
"armitage-street": "Armitage Street",
"barrows-school": "Barrows School",
"battle-street": "Battle Street",
"bennett-street": "Bennett Street",
"bowman-park": "Bowman Park",
"collins-drive": "Collins Drive",
"conrail-railroad": "Conrail Railroad",
"conservation-park": "Conservation Park",
"constantine-street": "Constantine Street",
"cushman-street": "Cushman Street",
"dollar-tree": "Dollar Tree",
"douglas-avenue": "Douglas Avenue",
"east-street": "East Street",
"elm-street": "Elm Street",
"flower-street": "Flower Street",
"foster-street": "Foster Street",
"french-street": "French Street",
"garden-street": "Garden Street",
"gem-pawnbroker": "Gem Pawnbroker",
"golden-finch-framing": "Golden Finch Framing",
"grant-avenue": "Grant Avenue",
"hoffman-pond": "Hoffman Pond",
"hoffman-street": "Hoffman Street",
"hook-avenue": "Hook Avenue",
"jefferson-street": "Jefferson Street",
"kelsey-street": "Kelsey Street",
"lafayette-park": "LaFayette Park",
"las-coffee-cafe": "L.A.'s Coffee Cafe",
"lincoln-avenue": "Lincoln Avenue",
"lowrys-books": "Lowry's Books",
"lynns-garage": "Lynn's Garage",
"main-street-barbell": "Main Street Barbell",
"main-street-cafe": "Main Street Cafe",
"main-street-fitness": "Main Street Fitness",
"main-street": "Main Street",
"maple-street": "Maple Street",
"marina-park": "Marina Park",
"market-street": "Market Street",
"memory-isle-park": "Memory Isle Park",
"memory-isle": "Memory Isle",
"michigan-avenue": "Michigan Avenue",
"middle-street": "Middle Street",
"millard-street": "Millard Street",
"moore-street": "Moore Street",
"morris-avenue": "Morris Avenue",
"mural-mall": "Mural Mall",
"paisanos-bar-and-grill": "Paisano's Bar and Grill",
"paisley-emporium": "Paisley Emporium",
"paparazzi-tattoo": "Paparazzi Tattoo",
"pealer-street": "Pealer Street",
"pine-river-road": "Pine River Road",
"pine-street": "Pine Street",
"pizza-hut": "Pizza Hut",
"portage-avenue": "Portage Avenue",
"portage-river": "Portage River",
"preferred-insurance-services": "Preferred Insurance Services",
"railroad-drive": "Railroad Drive",
"raisin-river-road": "Raisin River Road",
"river-city-appliance": "River City Appliance",
"river-drive": "River Drive",
"river-road": "River Road",
"river-street": "River Street",
"riverside-cemetery": "Riverside Cemetery",
"riverwalk-trail": "Riverwalk Trail",
"riviera-theatre": "Riviera Theatre",
"rocky-river": "Rocky River",
"sable-river-road": "Sable River Road",
"saint-joseph-river": "Saint Joseph River",
"scidmore-park-petting-zoo": "Scidmore Park Petting Zoo",
"scidmore-park": "Scidmore Park",
"scouter-park": "Scouter Park",
"sherwin-williams": "Sherwin-Williams",
"shiawassee-river-road": "Shiawassee River Road",
"south-street": "South Street",
"southern-michigan-bank": "Southern Michigan Bank",
"spring-street": "Spring Street",
"sturgeon-river-road": "Sturgeon River Road",
"three-rivers-city-hall": "Three Rivers City Hall",
"three-rivers-elementary-school": "Three Rivers Elementary School",
"three-rivers-fire-department": "Three Rivers Fire Department",
"three-rivers-high-school": "Three Rivers High School",
"three-rivers-middle-school": "Three Rivers Middle School",
"three-rivers-post-office": "Three Rivers Post Office",
"three-rivers-public-library": "Three Rivers Public Library",
"three-rivers": "Three Rivers",
"unique-jewelry": "Unique Jewelry",
"walnut-street": "Walnut Street",
"washington-street": "Washington Street",
"water-street": "Water Street",
"west-street": "West Street",
"wheeler-street": "Wheeler Street",
"william-towing": "William Towing",
"willow-drive": "Willow Drive",
"wood-street": "Wood Street",
"world-fare": "World Fare"
}
},
"welcome": {
"title": "Welcome",
@@ -741,7 +824,7 @@
"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.**",
"retry_square": "You didn't click the Square button. Try again.",
"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.**",
"add_tank": "Next we'll 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. The circle will be created outside the points that you draw. Finish the area by clicking on the starting node. **Continue tracing the tank.**",
"search_tank": "**Search for '{name}'**",
+5 -5
View File
@@ -60,13 +60,13 @@ export function uiIntroLine(context, reveal) {
lineId = null;
var padding = 100 * Math.pow(2, context.map().zoom() - 18);
var padding = 70 * Math.pow(2, context.map().zoom() - 18);
var box = pad(start, padding, context);
box.height = box.height + 100;
reveal(box, t('intro.lines.start'));
context.map().on('move.intro drawn.intro', function() {
padding = 100 * Math.pow(2, context.map().zoom() - 18);
padding = 70 * Math.pow(2, context.map().zoom() - 18);
box = pad(start, padding, context);
box.height = box.height + 100;
reveal(box, t('intro.lines.start'), { duration: 0 });
@@ -98,7 +98,7 @@ export function uiIntroLine(context, reveal) {
var box = pad(midpoint, padding, context);
box.height = box.height * 2;
reveal(box,
t('intro.lines.intersect', { name: t('intro.graph.flower_st') })
t('intro.lines.intersect', { name: t('intro.graph.name.flower-street') })
);
context.map().on('move.intro drawn.intro', function() {
@@ -106,7 +106,7 @@ export function uiIntroLine(context, reveal) {
box = pad(midpoint, padding, context);
box.height = box.height * 2;
reveal(box,
t('intro.lines.intersect', { name: t('intro.graph.flower_st') }),
t('intro.lines.intersect', { name: t('intro.graph.name.flower-street') }),
{ duration: 0 }
);
});
@@ -126,7 +126,7 @@ export function uiIntroLine(context, reveal) {
return;
else if (mode.id === 'select') {
var box = pad(intersection, 80, context);
reveal(box, t('intro.lines.restart', { name: t('intro.graph.flower_st') }));
reveal(box, t('intro.lines.restart', { name: t('intro.graph.name.flower-street') }));
d3.select(window).on('mousedown.intro', eventCancel, true);
timeout(chapter.restart, 3000);
return;
+3 -3
View File
@@ -140,7 +140,7 @@ export function uiIntroNavigation(context, reveal) {
context.history().reset('initial'); // ensure spring street exists
reveal('.search-header input',
t('intro.navigation.search', { name: t('intro.graph.spring_st') }));
t('intro.navigation.search', { name: t('intro.graph.name.spring-street') }));
d3.select('.search-header input')
.on('keyup.intro', checkSearchResult);
@@ -150,7 +150,7 @@ export function uiIntroNavigation(context, reveal) {
function checkSearchResult() {
var first = d3.select('.feature-list-item:nth-child(0n+2)'), // skip "No Results" item
firstName = first.select('.entity-name'),
name = t('intro.graph.spring_st');
name = t('intro.graph.name.spring-street');
if (!firstName.empty() && firstName.text() === name) {
reveal(first.node(), t('intro.navigation.choose', { name: name }));
@@ -178,7 +178,7 @@ export function uiIntroNavigation(context, reveal) {
timeout(function() {
reveal('.entity-editor-pane',
t('intro.navigation.chosen', {
name: t('intro.graph.spring_st'),
name: t('intro.graph.name.spring-street'),
button: icon('#icon-close', 'pre-text')
})
);