diff --git a/OsmAnd-java/src/main/java/net/osmand/binary/CommonWords.java b/OsmAnd-java/src/main/java/net/osmand/binary/CommonWords.java index bee5cb6639..d73c3f083a 100644 --- a/OsmAnd-java/src/main/java/net/osmand/binary/CommonWords.java +++ b/OsmAnd-java/src/main/java/net/osmand/binary/CommonWords.java @@ -38,6 +38,730 @@ public class CommonWords { static { addFrequentlyUsed("santa"); + addFrequentlyUsed("west"); + addFrequentlyUsed("east"); + addFrequentlyUsed("north"); + addFrequentlyUsed("northeast"); + addFrequentlyUsed("northwest"); + addFrequentlyUsed("southwest"); + addFrequentlyUsed("san"); + addFrequentlyUsed("southeast"); + addFrequentlyUsed("old"); + addFrequentlyUsed("main"); + addFrequentlyUsed("ridge"); + addFrequentlyUsed("josé"); + addFrequentlyUsed("view"); + addFrequentlyUsed("range"); + addFrequentlyUsed("pine"); + addFrequentlyUsed("church"); + addFrequentlyUsed("mill"); + addFrequentlyUsed("green"); + addFrequentlyUsed("point"); + addFrequentlyUsed("cove"); + addFrequentlyUsed("gardens"); + addFrequentlyUsed("francisco"); + addFrequentlyUsed("mountain"); + addFrequentlyUsed("jean"); + addFrequentlyUsed("joão"); + addFrequentlyUsed("meadow"); + addFrequentlyUsed("farm"); + addFrequentlyUsed("juan"); + addFrequentlyUsed("bay"); + addFrequentlyUsed("run"); + addFrequentlyUsed("national"); + addFrequentlyUsed("cedar"); + addFrequentlyUsed("hollow"); + addFrequentlyUsed("new"); + addFrequentlyUsed("high"); + addFrequentlyUsed("maple"); + addFrequentlyUsed("antonio"); + addFrequentlyUsed("walk"); + addFrequentlyUsed("maria"); + addFrequentlyUsed("spring"); + addFrequentlyUsed("pedro"); + addFrequentlyUsed("vista"); + addFrequentlyUsed("grand"); + addFrequentlyUsed("giuseppe"); + addFrequentlyUsed("antônio"); + addFrequentlyUsed("saint"); + addFrequentlyUsed("development"); + addFrequentlyUsed("washington"); + addFrequentlyUsed("john"); + addFrequentlyUsed("white"); + addFrequentlyUsed("silva"); + addFrequentlyUsed("willow"); + addFrequentlyUsed("school"); + addFrequentlyUsed("giovanni"); + addFrequentlyUsed("canyon"); + addFrequentlyUsed("general"); + addFrequentlyUsed("charles"); + addFrequentlyUsed("king"); + addFrequentlyUsed("moulin"); + addFrequentlyUsed("monte"); + addFrequentlyUsed("wood"); + addFrequentlyUsed("glen"); + addFrequentlyUsed("rock"); + addFrequentlyUsed("elm"); + addFrequentlyUsed("center"); + addFrequentlyUsed("mount"); + addFrequentlyUsed("tree"); + addFrequentlyUsed("red"); + addFrequentlyUsed("central"); + addFrequentlyUsed("norte"); + addFrequentlyUsed("delle"); + addFrequentlyUsed("église"); + addFrequentlyUsed("carlos"); + addFrequentlyUsed("springs"); + addFrequentlyUsed("doutor"); + addFrequentlyUsed("grande"); + addFrequentlyUsed("martin"); + addFrequentlyUsed("station"); + addFrequentlyUsed("statale"); + addFrequentlyUsed("alte"); + addFrequentlyUsed("paul"); + addFrequentlyUsed("hills"); + addFrequentlyUsed("beach"); + addFrequentlyUsed("brook"); + addFrequentlyUsed("walnut"); + addFrequentlyUsed("gate"); + addFrequentlyUsed("oaks"); + addFrequentlyUsed("cross"); + addFrequentlyUsed("pierre"); + addFrequentlyUsed("rural"); + addFrequentlyUsed("service"); + addFrequentlyUsed("manuel"); + addFrequentlyUsed("country"); + addFrequentlyUsed("blue"); + addFrequentlyUsed("miguel"); + addFrequentlyUsed("branch"); + addFrequentlyUsed("cherry"); + addFrequentlyUsed("don"); + addFrequentlyUsed("lincoln"); + addFrequentlyUsed("orchard"); + addFrequentlyUsed("little"); + addFrequentlyUsed("memorial"); + addFrequentlyUsed("clos"); + addFrequentlyUsed("club"); + addFrequentlyUsed("bois"); + addFrequentlyUsed("james"); + addFrequentlyUsed("ranch"); + addFrequentlyUsed("louis"); + addFrequentlyUsed("sunset"); + addFrequentlyUsed("pond"); + addFrequentlyUsed("george"); + addFrequentlyUsed("général"); + addFrequentlyUsed("costa"); + addFrequentlyUsed("santos"); + addFrequentlyUsed("victoria"); + addFrequentlyUsed("albert"); + addFrequentlyUsed("manor"); + addFrequentlyUsed("hall"); + addFrequentlyUsed("cemetery"); + addFrequentlyUsed("rose"); + addFrequentlyUsed("luis"); + addFrequentlyUsed("fox"); + addFrequentlyUsed("doctor"); + addFrequentlyUsed("long"); + addFrequentlyUsed("alameda"); + addFrequentlyUsed("smith"); + addFrequentlyUsed("padre"); + addFrequentlyUsed("woods"); + addFrequentlyUsed("villa"); + addFrequentlyUsed("lotissement"); + addFrequentlyUsed("indian"); + addFrequentlyUsed("pleasant"); + addFrequentlyUsed("jackson"); + addFrequentlyUsed("water"); + addFrequentlyUsed("wilson"); + addFrequentlyUsed("hickory"); + addFrequentlyUsed("deer"); + addFrequentlyUsed("birch"); + addFrequentlyUsed("chestnut"); + addFrequentlyUsed("eagle"); + addFrequentlyUsed("laurel"); + addFrequentlyUsed("heights"); + addFrequentlyUsed("jana"); + addFrequentlyUsed("shore"); + addFrequentlyUsed("highland"); + addFrequentlyUsed("roma"); + addFrequentlyUsed("oliveira"); + addFrequentlyUsed("garden"); + addFrequentlyUsed("château"); + addFrequentlyUsed("provincial"); + addFrequentlyUsed("thomas"); + addFrequentlyUsed("camp"); + addFrequentlyUsed("largo"); + addFrequentlyUsed("access"); + addFrequentlyUsed("georges"); + addFrequentlyUsed("college"); + addFrequentlyUsed("chapel"); + addFrequentlyUsed("house"); + addFrequentlyUsed("rosa"); + addFrequentlyUsed("johnson"); + addFrequentlyUsed("upper"); + addFrequentlyUsed("union"); + addFrequentlyUsed("crest"); + addFrequentlyUsed("gare"); + addFrequentlyUsed("market"); + addFrequentlyUsed("ленина"); + addFrequentlyUsed("jefferson"); + addFrequentlyUsed("stone"); + addFrequentlyUsed("franklin"); + addFrequentlyUsed("résidence"); + addFrequentlyUsed("francesco"); + addFrequentlyUsed("railroad"); + addFrequentlyUsed("black"); + addFrequentlyUsed("fontaine"); + addFrequentlyUsed("silver"); + addFrequentlyUsed("lower"); + addFrequentlyUsed("mile"); + addFrequentlyUsed("henri"); + addFrequentlyUsed("big"); + addFrequentlyUsed("brown"); + addFrequentlyUsed("kennedy"); + addFrequentlyUsed("pereira"); + addFrequentlyUsed("airport"); + addFrequentlyUsed("spruce"); + addFrequentlyUsed("woodland"); + addFrequentlyUsed("robert"); + addFrequentlyUsed("victor"); + addFrequentlyUsed("manoel"); + addFrequentlyUsed("meadows"); + addFrequentlyUsed("vicente"); + addFrequentlyUsed("ash"); + addFrequentlyUsed("rise"); + addFrequentlyUsed("pike"); + addFrequentlyUsed("luigi"); + addFrequentlyUsed("sant"); + addFrequentlyUsed("santo"); + addFrequentlyUsed("western"); + addFrequentlyUsed("poplar"); + addFrequentlyUsed("советская"); + addFrequentlyUsed("croix"); + addFrequentlyUsed("real"); + addFrequentlyUsed("vittorio"); + addFrequentlyUsed("mews"); + addFrequentlyUsed("taylor"); + addFrequentlyUsed("davis"); + addFrequentlyUsed("jose"); + addFrequentlyUsed("frontage"); + addFrequentlyUsed("gaulle"); + addFrequentlyUsed("bank"); + addFrequentlyUsed("ferry"); + addFrequentlyUsed("nord"); + addFrequentlyUsed("holly"); + addFrequentlyUsed("castle"); + addFrequentlyUsed("sierra"); + addFrequentlyUsed("acceso"); + addFrequentlyUsed("royal"); + addFrequentlyUsed("praça"); + addFrequentlyUsed("williams"); + addFrequentlyUsed("souza"); + addFrequentlyUsed("madison"); + addFrequentlyUsed("joseph"); + addFrequentlyUsed("riverside"); + addFrequentlyUsed("adams"); + addFrequentlyUsed("nacional"); + addFrequentlyUsed("oude"); + addFrequentlyUsed("tee"); + addFrequentlyUsed("port"); + addFrequentlyUsed("private"); + addFrequentlyUsed("mayo"); + addFrequentlyUsed("carlo"); + addFrequentlyUsed("york"); + addFrequentlyUsed("ferreira"); + addFrequentlyUsed("giacomo"); + addFrequentlyUsed("parade"); + addFrequentlyUsed("field"); + addFrequentlyUsed("professor"); + addFrequentlyUsed("jones"); + addFrequentlyUsed("maría"); + addFrequentlyUsed("lakeview"); + addFrequentlyUsed("great"); + addFrequentlyUsed("alves"); + addFrequentlyUsed("miller"); + addFrequentlyUsed("william"); + addFrequentlyUsed("henry"); + addFrequentlyUsed("coronel"); + addFrequentlyUsed("industrial"); + addFrequentlyUsed("maréchal"); + addFrequentlyUsed("acres"); + addFrequentlyUsed("joaquim"); + addFrequentlyUsed("landing"); + addFrequentlyUsed("summit"); + addFrequentlyUsed("burgemeester"); + addFrequentlyUsed("magnolia"); + addFrequentlyUsed("trace"); + addFrequentlyUsed("presidente"); + addFrequentlyUsed("falls"); + addFrequentlyUsed("jules"); + addFrequentlyUsed("docteur"); + addFrequentlyUsed("pacific"); + addFrequentlyUsed("auzoa"); + addFrequentlyUsed("prairie"); + addFrequentlyUsed("luiz"); + addFrequentlyUsed("diagonal"); + addFrequentlyUsed("cypress"); + addFrequentlyUsed("mar"); + addFrequentlyUsed("harbor"); + addFrequentlyUsed("shady"); + addFrequentlyUsed("clark"); + addFrequentlyUsed("fort"); + addFrequentlyUsed("bluff"); + addFrequentlyUsed("grant"); + addFrequentlyUsed("fork"); + addFrequentlyUsed("fire"); + addFrequentlyUsed("petit"); + addFrequentlyUsed("sycamore"); + addFrequentlyUsed("nelson"); + addFrequentlyUsed("queen"); + addFrequentlyUsed("city"); + addFrequentlyUsed("vico"); + addFrequentlyUsed("józefa"); + addFrequentlyUsed("pietro"); + addFrequentlyUsed("bear"); + addFrequentlyUsed("lima"); + addFrequentlyUsed("центральная"); + addFrequentlyUsed("pablo"); + addFrequentlyUsed("golden"); + addFrequentlyUsed("mary"); + addFrequentlyUsed("hillside"); + addFrequentlyUsed("haven"); + addFrequentlyUsed("alberto"); + addFrequentlyUsed("lorong"); + addFrequentlyUsed("elizabeth"); + addFrequentlyUsed("kings"); + addFrequentlyUsed("dogwood"); + addFrequentlyUsed("scott"); + addFrequentlyUsed("beech"); + addFrequentlyUsed("lange"); + addFrequentlyUsed("andré"); + addFrequentlyUsed("verde"); + addFrequentlyUsed("front"); + addFrequentlyUsed("obere"); + addFrequentlyUsed("hidden"); + addFrequentlyUsed("centre"); + addFrequentlyUsed("hamilton"); + addFrequentlyUsed("arthur"); + addFrequentlyUsed("parc"); + addFrequentlyUsed("quail"); + addFrequentlyUsed("julio"); + addFrequentlyUsed("jan"); + addFrequentlyUsed("bell"); + addFrequentlyUsed("sandy"); + addFrequentlyUsed("back"); + addFrequentlyUsed("sud"); + addFrequentlyUsed("paulo"); + addFrequentlyUsed("lago"); + addFrequentlyUsed("locust"); + addFrequentlyUsed("martín"); + addFrequentlyUsed("gabriel"); + addFrequentlyUsed("chase"); + addFrequentlyUsed("palm"); + addFrequentlyUsed("liberty"); + addFrequentlyUsed("mairie"); + addFrequentlyUsed("jorge"); + addFrequentlyUsed("castro"); + addFrequentlyUsed("fernando"); + addFrequentlyUsed("alter"); + addFrequentlyUsed("salvador"); + addFrequentlyUsed("hillcrest"); + addFrequentlyUsed("cité"); + addFrequentlyUsed("rodrigues"); + addFrequentlyUsed("prospect"); + addFrequentlyUsed("golf"); + addFrequentlyUsed("dom"); + addFrequentlyUsed("jacques"); + addFrequentlyUsed("berliner"); + addFrequentlyUsed("santiago"); + addFrequentlyUsed("transversal"); + addFrequentlyUsed("садовая"); + addFrequentlyUsed("guglielmo"); + addFrequentlyUsed("pointe"); + addFrequentlyUsed("circuit"); + addFrequentlyUsed("rang"); + addFrequentlyUsed("françois"); + addFrequentlyUsed("lewis"); + addFrequentlyUsed("railway"); + addFrequentlyUsed("allen"); + addFrequentlyUsed("grange"); + addFrequentlyUsed("ronda"); + addFrequentlyUsed("link"); + addFrequentlyUsed("harrison"); + addFrequentlyUsed("tower"); + addFrequentlyUsed("garibaldi"); + addFrequentlyUsed("novembre"); + addFrequentlyUsed("heritage"); + addFrequentlyUsed("anderson"); + addFrequentlyUsed("evergreen"); + addFrequentlyUsed("ribeiro"); + addFrequentlyUsed("ford"); + addFrequentlyUsed("linden"); + addFrequentlyUsed("short"); + addFrequentlyUsed("walker"); + addFrequentlyUsed("marie"); + addFrequentlyUsed("twin"); + addFrequentlyUsed("untere"); + addFrequentlyUsed("university"); + addFrequentlyUsed("douglas"); + addFrequentlyUsed("marconi"); + addFrequentlyUsed("martins"); + addFrequentlyUsed("windsor"); + addFrequentlyUsed("мира"); + addFrequentlyUsed("david"); + addFrequentlyUsed("middle"); + addFrequentlyUsed("fairview"); + addFrequentlyUsed("stanisława"); + addFrequentlyUsed("timber"); + addFrequentlyUsed("thompson"); + addFrequentlyUsed("generała"); + addFrequentlyUsed("virginia"); + addFrequentlyUsed("broad"); + addFrequentlyUsed("pasteur"); + addFrequentlyUsed("promenade"); + addFrequentlyUsed("hugo"); + addFrequentlyUsed("montée"); + addFrequentlyUsed("gomes"); + addFrequentlyUsed("warren"); + addFrequentlyUsed("luther"); + addFrequentlyUsed("columbia"); + addFrequentlyUsed("lakes"); + addFrequentlyUsed("campo"); + addFrequentlyUsed("puerto"); + addFrequentlyUsed("république"); + addFrequentlyUsed("enrico"); + addFrequentlyUsed("champ"); + addFrequentlyUsed("lawrence"); + addFrequentlyUsed("monroe"); + addFrequentlyUsed("alessandro"); + addFrequentlyUsed("władysława"); + addFrequentlyUsed("pod"); + addFrequentlyUsed("campbell"); + addFrequentlyUsed("pinto"); + addFrequentlyUsed("школьная"); + addFrequentlyUsed("estates"); + addFrequentlyUsed("howard"); + addFrequentlyUsed("orange"); + addFrequentlyUsed("croft"); + addFrequentlyUsed("star"); + addFrequentlyUsed("est"); + addFrequentlyUsed("triq"); + addFrequentlyUsed("beaver"); + addFrequentlyUsed("principale"); + addFrequentlyUsed("paz"); + addFrequentlyUsed("sol"); + addFrequentlyUsed("vieux"); + addFrequentlyUsed("southern"); + addFrequentlyUsed("greenway"); + addFrequentlyUsed("rocky"); + addFrequentlyUsed("roosevelt"); + addFrequentlyUsed("mai"); + addFrequentlyUsed("aspen"); + addFrequentlyUsed("russell"); + addFrequentlyUsed("pines"); + addFrequentlyUsed("concession"); + addFrequentlyUsed("wellington"); + addFrequentlyUsed("barrio"); + addFrequentlyUsed("neue"); + addFrequentlyUsed("post"); + addFrequentlyUsed("vale"); + addFrequentlyUsed("молодёжная"); + addFrequentlyUsed("октябрьская"); + addFrequentlyUsed("london"); + addFrequentlyUsed("four"); + addFrequentlyUsed("machado"); + addFrequentlyUsed("parque"); + addFrequentlyUsed("augusto"); + addFrequentlyUsed("carvalho"); + addFrequentlyUsed("markt"); + addFrequentlyUsed("division"); + addFrequentlyUsed("marina"); + addFrequentlyUsed("almeida"); + addFrequentlyUsed("horse"); + addFrequentlyUsed("berg"); + addFrequentlyUsed("mitchell"); + addFrequentlyUsed("pearl"); + addFrequentlyUsed("governador"); + addFrequentlyUsed("side"); + addFrequentlyUsed("robin"); + addFrequentlyUsed("iii"); + addFrequentlyUsed("vignes"); + addFrequentlyUsed("dale"); + addFrequentlyUsed("oriente"); + addFrequentlyUsed("coast"); + addFrequentlyUsed("baker"); + addFrequentlyUsed("ann"); + addFrequentlyUsed("europa"); + addFrequentlyUsed("maurice"); + addFrequentlyUsed("plac"); + addFrequentlyUsed("prince"); + addFrequentlyUsed("jardins"); + addFrequentlyUsed("ocean"); + addFrequentlyUsed("harris"); + addFrequentlyUsed("oxford"); + addFrequentlyUsed("kirchweg"); + addFrequentlyUsed("sunrise"); + addFrequentlyUsed("moore"); + addFrequentlyUsed("apple"); + addFrequentlyUsed("birkenweg"); + addFrequentlyUsed("flores"); + addFrequentlyUsed("marcel"); + addFrequentlyUsed("morgan"); + addFrequentlyUsed("ana"); + addFrequentlyUsed("cesare"); + addFrequentlyUsed("comunale"); + addFrequentlyUsed("mário"); + addFrequentlyUsed("olive"); + addFrequentlyUsed("rené"); + addFrequentlyUsed("vine"); + addFrequentlyUsed("rafael"); + addFrequentlyUsed("champs"); + addFrequentlyUsed("nova"); + addFrequentlyUsed("brasil"); + addFrequentlyUsed("privada"); + addFrequentlyUsed("barbosa"); + addFrequentlyUsed("mare"); + addFrequentlyUsed("dias"); + addFrequentlyUsed("leclerc"); + addFrequentlyUsed("daniel"); + addFrequentlyUsed("dante"); + addFrequentlyUsed("parker"); + addFrequentlyUsed("francis"); + addFrequentlyUsed("prés"); + addFrequentlyUsed("knoll"); + addFrequentlyUsed("torre"); + addFrequentlyUsed("contrada"); + addFrequentlyUsed("località"); + addFrequentlyUsed("mesa"); + addFrequentlyUsed("stade"); + addFrequentlyUsed("hampton"); + addFrequentlyUsed("alfredo"); + addFrequentlyUsed("peak"); + addFrequentlyUsed("ross"); + addFrequentlyUsed("лесная"); + addFrequentlyUsed("ivy"); + addFrequentlyUsed("filho"); + addFrequentlyUsed("mills"); + addFrequentlyUsed("major"); + addFrequentlyUsed("fratelli"); + addFrequentlyUsed("garcía"); + addFrequentlyUsed("wild"); + addFrequentlyUsed("gordon"); + addFrequentlyUsed("diego"); + addFrequentlyUsed("cerro"); + addFrequentlyUsed("cambridge"); + addFrequentlyUsed("alta"); + addFrequentlyUsed("home"); + addFrequentlyUsed("ramón"); + addFrequentlyUsed("raymond"); + addFrequentlyUsed("juniper"); + addFrequentlyUsed("redwood"); + addFrequentlyUsed("crystal"); + addFrequentlyUsed("mulberry"); + addFrequentlyUsed("новая"); + addFrequentlyUsed("poniente"); + addFrequentlyUsed("alten"); + addFrequentlyUsed("гагарина"); + addFrequentlyUsed("bellevue"); + addFrequentlyUsed("veterans"); + addFrequentlyUsed("hope"); + addFrequentlyUsed("jaurès"); + addFrequentlyUsed("summer"); + addFrequentlyUsed("bahnhof"); + addFrequentlyUsed("r-c"); + addFrequentlyUsed("oakwood"); + addFrequentlyUsed("richmond"); + addFrequentlyUsed("paris"); + addFrequentlyUsed("lorenzo"); + addFrequentlyUsed("hof"); + addFrequentlyUsed("mariano"); + addFrequentlyUsed("navajo"); + addFrequentlyUsed("комсомольская"); + addFrequentlyUsed("kleine"); + addFrequentlyUsed("lodge"); + addFrequentlyUsed("torres"); + addFrequentlyUsed("leśna"); + addFrequentlyUsed("cardinal"); + addFrequentlyUsed("marsh"); + addFrequentlyUsed("fern"); + addFrequentlyUsed("campos"); + addFrequentlyUsed("nationale"); + addFrequentlyUsed("berry"); + addFrequentlyUsed("commerce"); + addFrequentlyUsed("ignacio"); + addFrequentlyUsed("acesso"); + addFrequentlyUsed("madrid"); + addFrequentlyUsed("mission"); + addFrequentlyUsed("gang"); + addFrequentlyUsed("oeste"); + addFrequentlyUsed("cherokee"); + addFrequentlyUsed("paolo"); + addFrequentlyUsed("stewart"); + addFrequentlyUsed("cliff"); + addFrequentlyUsed("eduardo"); + addFrequentlyUsed("marshall"); + addFrequentlyUsed("dam"); + addFrequentlyUsed("pioneer"); + addFrequentlyUsed("alfred"); + addFrequentlyUsed("greenwood"); + addFrequentlyUsed("robinson"); + addFrequentlyUsed("acacias"); + addFrequentlyUsed("lópez"); + addFrequentlyUsed("tadeusza"); + addFrequentlyUsed("leonardo"); + addFrequentlyUsed("hilltop"); + addFrequentlyUsed("diamond"); + addFrequentlyUsed("quarry"); + addFrequentlyUsed("het"); + addFrequentlyUsed("temple"); + addFrequentlyUsed("scenic"); + addFrequentlyUsed("alexander"); + addFrequentlyUsed("победы"); + addFrequentlyUsed("osiedle"); + addFrequentlyUsed("écoles"); + addFrequentlyUsed("cleveland"); + addFrequentlyUsed("lynn"); + addFrequentlyUsed("top"); + addFrequentlyUsed("mont"); + addFrequentlyUsed("polna"); + addFrequentlyUsed("leaf"); + addFrequentlyUsed("vieira"); + addFrequentlyUsed("cottonwood"); + addFrequentlyUsed("perry"); + addFrequentlyUsed("morris"); + addFrequentlyUsed("oberer"); + addFrequentlyUsed("domingo"); + addFrequentlyUsed("hawthorne"); + addFrequentlyUsed("autumn"); + addFrequentlyUsed("alto"); + addFrequentlyUsed("chapelle"); + addFrequentlyUsed("kelly"); + addFrequentlyUsed("sherwood"); + addFrequentlyUsed("garcia"); + addFrequentlyUsed("bruce"); + addFrequentlyUsed("cour"); + addFrequentlyUsed("petite"); + addFrequentlyUsed("gap"); + addFrequentlyUsed("sea"); + addFrequentlyUsed("émile"); + addFrequentlyUsed("murray"); + addFrequentlyUsed("tangenziale"); + addFrequentlyUsed("mühlenweg"); + addFrequentlyUsed("gonçalves"); + addFrequentlyUsed("eastern"); + addFrequentlyUsed("belle"); + addFrequentlyUsed("northern"); + addFrequentlyUsed("xxiii"); + addFrequentlyUsed("vicinale"); + addFrequentlyUsed("hemlock"); + addFrequentlyUsed("hunter"); + addFrequentlyUsed("лет"); + addFrequentlyUsed("roberts"); + addFrequentlyUsed("heather"); + addFrequentlyUsed("bernardo"); + addFrequentlyUsed("verte"); + addFrequentlyUsed("arbor"); + addFrequentlyUsed("puits"); + addFrequentlyUsed("mine"); + addFrequentlyUsed("stefana"); + addFrequentlyUsed("güterweg"); + addFrequentlyUsed("newton"); + addFrequentlyUsed("кирова"); + addFrequentlyUsed("riverview"); + addFrequentlyUsed("clay"); + addFrequentlyUsed("sint"); + addFrequentlyUsed("aldo"); + addFrequentlyUsed("tilleuls"); + addFrequentlyUsed("claude"); + addFrequentlyUsed("kossuth"); + addFrequentlyUsed("edward"); + addFrequentlyUsed("communale"); + addFrequentlyUsed("fuente"); + addFrequentlyUsed("cooper"); + addFrequentlyUsed("trails"); + addFrequentlyUsed("nieuwe"); + addFrequentlyUsed("sebastião"); + addFrequentlyUsed("roberto"); + addFrequentlyUsed("overlook"); + addFrequentlyUsed("первомайская"); + addFrequentlyUsed("roger"); + addFrequentlyUsed("turner"); + addFrequentlyUsed("france"); + addFrequentlyUsed("mario"); + addFrequentlyUsed("iv"); + addFrequentlyUsed("sugar"); + addFrequentlyUsed("hudson"); + addFrequentlyUsed("lopes"); + addFrequentlyUsed("evans"); + addFrequentlyUsed("cottage"); + addFrequentlyUsed("raya"); + addFrequentlyUsed("branco"); + addFrequentlyUsed("vernon"); + addFrequentlyUsed("traverse"); + addFrequentlyUsed("emerald"); + addFrequentlyUsed("dove"); + addFrequentlyUsed("felipe"); + addFrequentlyUsed("wildwood"); + addFrequentlyUsed("moro"); + addFrequentlyUsed("marechal"); + addFrequentlyUsed("köz"); + addFrequentlyUsed("marion"); + addFrequentlyUsed("marco"); + addFrequentlyUsed("léon"); + addFrequentlyUsed("mt"); + addFrequentlyUsed("veneto"); + addFrequentlyUsed("mazzini"); + addFrequentlyUsed("plum"); + addFrequentlyUsed("boundary"); + addFrequentlyUsed("barros"); + addFrequentlyUsed("tour"); + addFrequentlyUsed("andrews"); + addFrequentlyUsed("wiesenweg"); + addFrequentlyUsed("maggio"); + addFrequentlyUsed("ricardo"); + addFrequentlyUsed("pennsylvania"); + addFrequentlyUsed("myrtle"); + addFrequentlyUsed("matteotti"); + addFrequentlyUsed("hinter"); + addFrequentlyUsed("линия"); + addFrequentlyUsed("ouest"); + addFrequentlyUsed("maja"); + addFrequentlyUsed("kent"); + addFrequentlyUsed("stanley"); + addFrequentlyUsed("jacob"); + addFrequentlyUsed("principal"); + addFrequentlyUsed("rogers"); + addFrequentlyUsed("homestead"); + addFrequentlyUsed("collins"); + addFrequentlyUsed("richard"); + addFrequentlyUsed("crown"); + addFrequentlyUsed("moss"); + addFrequentlyUsed("moreno"); + addFrequentlyUsed("garfield"); + addFrequentlyUsed("belmont"); + addFrequentlyUsed("rolling"); + addFrequentlyUsed("sportplatz"); + addFrequentlyUsed("côte"); + addFrequentlyUsed("hospital"); + addFrequentlyUsed("sun"); + addFrequentlyUsed("горького"); + addFrequentlyUsed("flat"); + addFrequentlyUsed("colonial"); + addFrequentlyUsed("ramos"); + addFrequentlyUsed("lilas"); + addFrequentlyUsed("mason"); + addFrequentlyUsed("forge"); + addFrequentlyUsed("shadow"); + addFrequentlyUsed("gold"); + addFrequentlyUsed("rocha"); + addFrequentlyUsed("linda"); + addFrequentlyUsed("young"); + addFrequentlyUsed("estate"); + addFrequentlyUsed("martiri"); + addFrequentlyUsed("verdi"); + addFrequentlyUsed("augusta"); + + addCommon("la"); addCommon("via"); @@ -108,6 +832,7 @@ public class CommonWords { addCommon("dr"); addCommon("y"); addCommon("un"); + addCommon("nw"); @@ -195,9 +920,7 @@ public class CommonWords { addCommon("alley"); addCommon("são"); addCommon("les"); - addCommon("delle"); addCommon("paseo"); - addCommon("alte"); addCommon("autostrada"); addCommon("iela"); addCommon("autovía"); @@ -232,8 +955,8 @@ public class CommonWords { addCommon("crest"); addCommon("ave"); - addCommon("expressway)"); - + addCommon("turnpike"); + addCommon("autoroute"); addCommon("crossing"); addCommon("camí"); @@ -261,6 +984,14 @@ public class CommonWords { addCommon("aux"); addCommon("spur"); addCommon("ringstraße"); + addCommon("lindenstraße"); + addCommon("kirchstraße"); + addCommon("bergstraße"); + addCommon("mühlenstraße"); + addCommon("industriestraße"); + addCommon("schillerstraße"); + addCommon("talstraße"); + addCommon("gartenstraße"); addCommon("prospect"); addCommon("m."); addCommon("chaussee"); @@ -403,7 +1134,6 @@ public class CommonWords { addCommon("nábřeží"); addCommon("ostrova"); addCommon("ostrůvek"); - addCommon("lane"); addCommon("vesnice"); addCommon("jezdit"); addCommon("sestup"); diff --git a/OsmAnd-java/src/main/java/net/osmand/util/OpeningHoursParser.java b/OsmAnd-java/src/main/java/net/osmand/util/OpeningHoursParser.java index 723ed50128..4af114b427 100644 --- a/OsmAnd-java/src/main/java/net/osmand/util/OpeningHoursParser.java +++ b/OsmAnd-java/src/main/java/net/osmand/util/OpeningHoursParser.java @@ -1172,13 +1172,7 @@ public class OpeningHoursParser { @Override public boolean isOpened24_7() { - boolean opened24_7 = true; - for (int i = 0; i < 7; i++) { - if (!days[i]) { - opened24_7 = false; - break; - } - } + boolean opened24_7 = isOpenedEveryDay(); if (opened24_7) { if (startTimes != null && startTimes.size() > 0) { @@ -1196,6 +1190,17 @@ public class OpeningHoursParser { return false; } + public boolean isOpenedEveryDay() { + boolean openedEveryDay = true; + for (int i = 0; i < 7; i++) { + if (!days[i]) { + openedEveryDay = false; + break; + } + } + return openedEveryDay; + } + @Override public String getTime(Calendar cal, boolean checkAnotherDay, int limit, boolean opening) { StringBuilder sb = new StringBuilder(); diff --git a/OsmAnd/src/net/osmand/plus/osmedit/BasicEditPoiFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/BasicEditPoiFragment.java index f476a7528a..4c52132564 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/BasicEditPoiFragment.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/BasicEditPoiFragment.java @@ -148,6 +148,9 @@ public class BasicEditPoiFragment extends BaseOsmAndFragment } public void setBasicOpeningHoursRule(BasicOpeningHourRule item, int position) { + if (item.getStartTime() == 0 && item.getEndTime() == 0 && item.isOpenedEveryDay()) { + item.setEndTime(24 * 60); + } mOpeningHoursAdapter.setOpeningHoursRule(item, position); }