diff options
98 files changed, 6234 insertions, 6746 deletions
diff --git a/conf/general.yml-example b/conf/general.yml-example index 8d5018362..4fbf43635 100644 --- a/conf/general.yml-example +++ b/conf/general.yml-example @@ -69,8 +69,12 @@ MAPIT_TYPES: [ 'ZZZ' ] # MAPIT_TYPES_CHILDREN: [ 'DIW', 'LBW', 'MTW', 'UTE', 'UTW', 'CED', 'COP', 'LGW' ] MAPIT_TYPES_CHILDREN: '' +# Which service to use to look up results from e.g. front page searches. +# Possible choices are Google, Bing, or OSM (blank will use OSM by default). +GEOCODER: '' + # If you wish to use Google Maps or Bing Maps Geocoding, get and put the -# relevant key here. Without a key, geocoding will use OSM's Nominatim. +# relevant key here. GOOGLE_MAPS_API_KEY: '' BING_MAPS_API_KEY: '' diff --git a/data/zurich/openlayers.zurich.cfg b/data/zurich/openlayers.zurich.cfg new file mode 100644 index 000000000..7046384f2 --- /dev/null +++ b/data/zurich/openlayers.zurich.cfg @@ -0,0 +1,42 @@ +# This file includes the OpenLayers code that FixMyStreet currently uses. + +[first] + +[last] + +[include] +# Have to include the renderers manually +OpenLayers/Renderer/Canvas.js +OpenLayers/Renderer/SVG.js +OpenLayers/Renderer/VML.js +OpenLayers/Strategy/Fixed.js +OpenLayers/Strategy/BBOX.js +OpenLayers/Control/ArgParser.js +OpenLayers/Control/Attribution.js +OpenLayers/Control/DragFeature.js +OpenLayers/Control/Navigation.js +OpenLayers/Control/PanZoom.js +OpenLayers/Control/PinchZoom.js +OpenLayers/Control/Permalink.js +OpenLayers/Control/SelectFeature.js +OpenLayers/Format/JSON.js +OpenLayers/Format/KML.js +OpenLayers/Handler/Click.js +OpenLayers/Feature/Vector.js +OpenLayers/Rule.js +OpenLayers/Style.js +OpenLayers/StyleMap.js +OpenLayers/Geometry/Point.js +OpenLayers/Protocol/HTTP.js +OpenLayers/Layer/SphericalMercator.js # For 4326 +OpenLayers/Layer/Vector.js +OpenLayers/Layer/XYZ.js +OpenLayers/Popup/FramedCloud.js + +# Zurich things +OpenLayers/Format/WMTSCapabilities/v1_0_0.js +OpenLayers/Format/WMTSCapabilities.js +OpenLayers/Layer/WMTS.js + +[exclude] + diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po index dfe83f074..44584597a 100644 --- a/locale/FixMyStreet.po +++ b/locale/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2012-10-24 11:20+0100\n" +"POT-Creation-Date: 2012-12-10 13:18+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <team@fixmystreet.com>\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:563 perllib/FixMyStreet/DB/ResultSet/Problem.pm:339 +#: perllib/FixMyStreet/DB/Result/Problem.pm:560 perllib/FixMyStreet/DB/ResultSet/Problem.pm:339 msgid " and " msgstr "" @@ -53,15 +53,15 @@ msgstr "" msgid "%d questionnaires sent – %d answered (%s%%)" msgstr "" -#: templates/web/fixmystreet/report/_support.html:3 +#: templates/web/default/report/_support.html:3 msgid "%d supporters" msgstr "" -#: templates/web/default/reports/council.html:0 templates/web/default/reports/council.html:26 templates/web/emptyhomes/reports/council.html:11 templates/web/emptyhomes/reports/council.html:13 +#: templates/web/default/reports/body.html:0 templates/web/default/reports/body.html:26 templates/web/emptyhomes/reports/body.html:11 templates/web/emptyhomes/reports/body.html:13 msgid "%s - Summary reports" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:613 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "%s ref: %s" msgstr "" @@ -85,7 +85,7 @@ msgstr "" msgid "(Don't worry — %s)" msgstr "" -#: templates/web/default/admin/report_blocks.html:11 +#: templates/web/default/admin/report_blocks.html:11 templates/web/default/admin/search_users.html:23 msgid "(Email in abuse table)" msgstr "" @@ -105,7 +105,7 @@ msgstr "" msgid "(fixed)" msgstr "" -#: templates/web/default/index.html:12 templates/web/default/index.html:8 templates/web/fixmystreet/around/postcode_form.html:10 +#: templates/web/default/index.html:12 templates/web/default/index.html:8 templates/web/fixmystreet/around/intro.html:2 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "" @@ -113,7 +113,7 @@ msgstr "" msgid "(not sent to council)" msgstr "" -#: templates/web/default/report/new/fill_in_details_form.html:217 +#: templates/web/default/report/new/fill_in_details_form.html:217 templates/web/zurich/report/new/fill_in_details_form.html:118 msgid "(optional)" msgstr "" @@ -125,7 +125,7 @@ msgstr "" msgid "(we never show your email address or phone number)" msgstr "" -#: templates/web/default/report/display.html:209 +#: templates/web/default/report/update-form.html:156 msgid "(we never show your email)" msgstr "" @@ -133,11 +133,11 @@ msgstr "" msgid "*unknown*" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:630 perllib/FixMyStreet/App/Controller/Report/New.pm:658 perllib/FixMyStreet/DB/Result/Problem.pm:353 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:628 perllib/FixMyStreet/App/Controller/Report/New.pm:656 perllib/FixMyStreet/DB/Result/Problem.pm:353 msgid "-- Pick a category --" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:610 perllib/FixMyStreet/DB/Result/Problem.pm:359 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:608 perllib/FixMyStreet/DB/Result/Problem.pm:359 msgid "-- Pick a property type --" msgstr "" @@ -145,7 +145,7 @@ msgstr "" msgid ". You can <a href=\"%s%s\">view the problem on this site</a>." msgstr "" -#: templates/web/fixmystreet/report/_support.html:3 +#: templates/web/default/report/_support.html:3 msgid "1 supporter" msgstr "" @@ -163,7 +163,7 @@ msgid "" "</p>" msgstr "" -#: templates/web/fixmystreet/questionnaire/completed-open.html:1 +#: templates/web/fixmystreet/questionnaire/completed-open.html:6 msgid "" "<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" "suggestions: why not try <a href=\"http://www.writetothem.com/\">writing direct\n" @@ -173,7 +173,7 @@ msgid "" "</p>" msgstr "" -#: templates/web/default/questionnaire/completed-open.html:1 +#: templates/web/default/questionnaire/completed-open.html:6 msgid "" "<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" "suggestions: why not try writing to your local representative or, if it’s\n" @@ -221,11 +221,11 @@ msgstr "" msgid "<strong>%d</strong> live problems" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:182 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:193 msgid "<strong>No</strong> Let me confirm my report by email" msgstr "" -#: templates/web/fixmystreet/report/display.html:170 +#: templates/web/fixmystreet/report/update-form.html:108 msgid "<strong>No</strong> Let me confirm my update by email" msgstr "" @@ -241,11 +241,11 @@ msgstr "" msgid "<strong>No</strong>, let me confirm my report by email:" msgstr "" -#: templates/web/default/report/display.html:164 +#: templates/web/default/report/update-form.html:115 msgid "<strong>No</strong>, let me confirm my update by email:" msgstr "" -#: templates/web/default/auth/general.html:37 templates/web/default/report/display.html:142 templates/web/default/report/new/fill_in_details_form.html:140 templates/web/fixmystreet/auth/general.html:36 templates/web/fixmystreet/auth/general.html:38 templates/web/fixmystreet/report/display.html:147 templates/web/fixmystreet/report/new/fill_in_details_form.html:158 +#: templates/web/default/auth/general.html:37 templates/web/default/report/new/fill_in_details_form.html:140 templates/web/default/report/update-form.html:93 templates/web/fixmystreet/auth/general.html:36 templates/web/fixmystreet/auth/general.html:38 templates/web/fixmystreet/report/new/fill_in_details_form.html:169 templates/web/fixmystreet/report/update-form.html:85 msgid "<strong>Yes</strong> I have a password" msgstr "" @@ -273,11 +273,11 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "" -#: templates/web/bromley/report/display.html:207 templates/web/default/report/display.html:214 templates/web/fixmystreet/report/display.html:211 +#: templates/web/bromley/report/display.html:207 templates/web/default/report/update-form.html:161 templates/web/fixmystreet/report/update-form.html:146 msgid "Alert me to future updates" msgstr "" -#: templates/web/default/reports/index.html:3 +#: templates/web/default/reports/index.html:3 templates/web/fixmybarangay/reports/index.html:3 msgid "All Reports" msgstr "" @@ -285,7 +285,7 @@ msgstr "" msgid "All confirmed" msgstr "" -#: templates/web/barnet/footer.html:20 templates/web/bromley/footer.html:21 templates/web/bromley/header.html:77 templates/web/default/footer.html:11 templates/web/fiksgatami/footer.html:7 templates/web/fiksgatami/nn/footer.html:7 templates/web/fixmybarangay/footer.html:20 templates/web/fixmystreet/footer.html:49 templates/web/reading/footer.html:8 +#: templates/web/barnet/footer.html:20 templates/web/bromley/footer.html:21 templates/web/bromley/header.html:77 templates/web/default/footer.html:11 templates/web/fiksgatami/footer.html:7 templates/web/fiksgatami/nn/footer.html:7 templates/web/fixmybarangay/footer.html:20 templates/web/fixmystreet/footer.html:49 templates/web/reading/footer.html:8 templates/web/stevenage/footer.html:43 templates/web/zurich/footer.html:12 msgid "All reports" msgstr "" @@ -305,7 +305,7 @@ msgstr "" msgid "All the information you provide here will be sent to <strong>%s</strong> or a relevant local body such as <strong>TfL</strong>, via the London Report-It system." msgstr "" -#: templates/web/bromley/report/new/fill_in_details_form.html:4 templates/web/bromley/report/new/fill_in_details_form.html:6 templates/web/default/report/new/councils_text_all.html:17 templates/web/default/report/new/councils_text_all.html:19 templates/web/default/report/new/fill_in_details_form.html:11 templates/web/default/report/new/fill_in_details_form.html:13 templates/web/fixmystreet/report/new/fill_in_details_form.html:6 templates/web/fixmystreet/report/new/fill_in_details_form.html:8 +#: templates/web/bromley/report/new/fill_in_details_form.html:4 templates/web/bromley/report/new/fill_in_details_form.html:6 templates/web/default/report/new/councils_text_all.html:17 templates/web/default/report/new/councils_text_all.html:19 templates/web/default/report/new/fill_in_details_form.html:11 templates/web/default/report/new/fill_in_details_form.html:13 templates/web/fixmystreet/report/new/fill_in_details_form.html:6 templates/web/fixmystreet/report/new/fill_in_details_form.html:8 templates/web/zurich/report/new/fill_in_details_form.html:6 templates/web/zurich/report/new/fill_in_details_form.html:8 msgid "All the information you provide here will be sent to <strong>%s</strong>." msgstr "" @@ -329,11 +329,11 @@ msgstr "" msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?" msgstr "" -#: templates/web/fixmystreet/footer.html:17 +#: templates/web/fixmystreet/footer.html:17 templates/web/stevenage/footer.html:17 msgid "Are you a developer?" msgstr "" -#: templates/web/fixmystreet/footer.html:21 +#: templates/web/fixmystreet/footer.html:21 templates/web/stevenage/footer.html:21 msgid "Are you from a council?" msgstr "" @@ -353,6 +353,10 @@ msgstr "" msgid "Be sure to choose the right category, because we use that to determine to whom the report is sent." msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1032 +msgid "Bodies" +msgstr "" + #: templates/web/fiksgatami/footer.html:16 templates/web/fiksgatami/nn/footer.html:16 msgid "Built by <a href=\"http://www.mysociety.org/\">mySociety</a> and maintained by <a href=\"http://www.nuug.no/\">NUUG</a>" msgstr "" @@ -365,7 +369,7 @@ msgstr "" msgid "Can't see the map? <a href='%s' rel='nofollow'>Skip this step</a>" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 perllib/FixMyStreet/App/Controller/Report/New.pm:660 templates/web/bromley/report/new/fill_in_details_form.html:68 templates/web/default/admin/council_contacts.html:37 templates/web/default/admin/index.html:36 templates/web/default/admin/list_flagged.html:14 templates/web/default/admin/search_reports.html:17 templates/web/fixmystreet/report/new/fill_in_details_form.html:74 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:631 perllib/FixMyStreet/App/Controller/Report/New.pm:658 templates/web/bromley/report/new/fill_in_details_form.html:68 templates/web/default/admin/council_contacts.html:37 templates/web/default/admin/index.html:36 templates/web/default/admin/list_flagged.html:14 templates/web/default/admin/search_reports.html:17 templates/web/fixmystreet/report/new/fill_in_details_form.html:74 templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Category" msgstr "" @@ -385,15 +389,15 @@ msgstr "" msgid "Change Password" msgstr "" -#: templates/web/fixmystreet/around/_report_banner.html:2 +#: templates/web/default/js/validation_strings.html:22 templates/web/fixmystreet/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "" -#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:82 templates/web/default/admin/report_edit.html:18 templates/web/default/admin/report_edit.html:20 templates/web/default/dashboard/index.html:138 templates/web/default/dashboard/index.html:140 templates/web/default/report/display.html:79 templates/web/default/report/display.html:81 templates/web/fixmystreet/report/banner.html:15 templates/web/fixmystreet/report/display.html:90 templates/web/fixmystreet/report/display.html:92 +#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:82 templates/web/default/admin/report_edit.html:18 templates/web/default/admin/report_edit.html:20 templates/web/default/dashboard/index.html:138 templates/web/default/dashboard/index.html:140 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:32 templates/web/fixmystreet/report/banner.html:15 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:30 msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:698 +#: perllib/FixMyStreet/DB/Result/Problem.pm:695 msgid "Closed by council" msgstr "" @@ -453,11 +457,11 @@ msgstr "" msgid "Confirm account" msgstr "" -#: templates/web/fixmystreet/report/display.html:165 templates/web/fixmystreet/report/new/fill_in_details_form.html:176 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:187 templates/web/fixmystreet/report/update-form.html:103 msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated." msgstr "" -#: templates/web/default/questionnaire/creator_fixed.html:1 templates/web/default/tokens/confirm_problem.html:1 templates/web/default/tokens/confirm_problem.html:3 templates/web/default/tokens/confirm_update.html:1 templates/web/default/tokens/confirm_update.html:3 templates/web/emptyhomes/tokens/confirm_problem.html:1 templates/web/emptyhomes/tokens/confirm_problem.html:3 +#: templates/web/default/questionnaire/creator_fixed.html:1 templates/web/default/tokens/confirm_problem.html:1 templates/web/default/tokens/confirm_problem.html:3 templates/web/default/tokens/confirm_update.html:1 templates/web/default/tokens/confirm_update.html:3 templates/web/emptyhomes/tokens/confirm_problem.html:1 templates/web/emptyhomes/tokens/confirm_problem.html:3 templates/web/southampton/tokens/confirm_problem.html:1 templates/web/southampton/tokens/confirm_problem.html:3 msgid "Confirmation" msgstr "" @@ -489,7 +493,7 @@ msgstr "" msgid "Contact the team" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1164 perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1159 perllib/FixMyStreet/App/Controller/Admin.pm:1187 msgid "Could not find user" msgstr "" @@ -497,7 +501,7 @@ msgstr "" msgid "Council" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 templates/web/default/admin/council_list.html:1 +#: templates/web/default/admin/council_list.html:1 msgid "Council contacts" msgstr "" @@ -549,7 +553,7 @@ msgstr "" msgid "Deleted" msgstr "" -#: templates/web/bromley/report/new/fill_in_details_form.html:54 templates/web/fixmystreet/report/new/fill_in_details_form.html:66 +#: templates/web/bromley/report/new/fill_in_details_form.html:54 templates/web/fixmystreet/report/new/fill_in_details_form.html:66 templates/web/zurich/report/new/fill_in_details_form.html:60 msgid "Details" msgstr "" @@ -569,7 +573,7 @@ msgstr "" msgid "Do you have a FixMyBarangay password?" msgstr "" -#: templates/web/default/auth/general.html:32 templates/web/fixmystreet/auth/general.html:32 templates/web/fixmystreet/report/display.html:144 templates/web/fixmystreet/report/new/fill_in_details_form.html:154 +#: templates/web/default/auth/general.html:32 templates/web/fixmystreet/auth/general.html:32 templates/web/fixmystreet/report/new/fill_in_details_form.html:165 templates/web/fixmystreet/report/update-form.html:82 msgid "Do you have a FixMyStreet password?" msgstr "" @@ -597,15 +601,15 @@ msgstr "" msgid "Editor" msgstr "" -#: templates/web/bromley/report/display.html:126 templates/web/default/admin/council_contacts.html:38 templates/web/default/admin/council_edit.html:70 templates/web/default/admin/list_flagged.html:12 templates/web/default/admin/list_flagged.html:35 templates/web/default/admin/list_updates.html:8 templates/web/default/admin/search_abuse.html:11 templates/web/default/admin/search_reports.html:15 templates/web/default/admin/search_users.html:13 templates/web/fixmystreet/auth/general.html:20 templates/web/fixmystreet/report/display.html:136 +#: templates/web/bromley/report/display.html:126 templates/web/default/admin/council_contacts.html:38 templates/web/default/admin/council_edit.html:70 templates/web/default/admin/list_flagged.html:12 templates/web/default/admin/list_flagged.html:35 templates/web/default/admin/list_updates.html:8 templates/web/default/admin/search_reports.html:15 templates/web/default/admin/search_users.html:13 templates/web/fixmystreet/auth/general.html:20 templates/web/fixmystreet/report/update-form.html:74 msgid "Email" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1140 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1135 msgid "Email added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1132 msgid "Email already in abuse list" msgstr "" @@ -621,15 +625,15 @@ msgstr "" msgid "Email:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:612 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:610 msgid "Empty flat or maisonette" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:611 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:609 msgid "Empty house or bungalow" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:614 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:612 msgid "Empty office or other commercial" msgstr "" @@ -637,11 +641,11 @@ msgstr "" msgid "Empty property details form" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:615 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:613 msgid "Empty pub or bar" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:616 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:614 msgid "Empty public building - school, hospital, etc." msgstr "" @@ -657,6 +661,10 @@ msgstr "" msgid "End month:" msgstr "" +#: perllib/FixMyStreet/Cobrand/Zurich.pm:9 +msgid "Enter a Zürich street name" +msgstr "" + #: templates/web/emptyhomes/index.html:40 templates/web/emptyhomes/index.html:41 msgid "Enter a nearby GB postcode, or street name and area" msgstr "" @@ -669,19 +677,19 @@ msgstr "" msgid "Enter a nearby postcode, or street name and area" msgstr "" -#: templates/web/default/around/postcode_form.html:1 templates/web/default/around/postcode_form.html:2 templates/web/fixmystreet/around/postcode_form.html:13 templates/web/fixmystreet/around/postcode_form.html:14 +#: templates/web/default/around/postcode_form.html:1 templates/web/default/around/postcode_form.html:2 templates/web/fixmystreet/around/postcode_form.html:10 templates/web/fixmystreet/around/postcode_form.html:11 msgid "Enter a nearby street name and area" msgstr "" -#: templates/web/default/auth/general.html:64 templates/web/default/report/display.html:171 templates/web/default/report/new/fill_in_details_form.html:169 +#: templates/web/default/auth/general.html:64 templates/web/default/report/new/fill_in_details_form.html:169 templates/web/default/report/update-form.html:122 msgid "Enter a new password:" msgstr "" -#: templates/web/bromley/report/display.html:148 templates/web/bromley/report/new/fill_in_details_form.html:189 templates/web/fixmystreet/auth/general.html:61 templates/web/fixmystreet/report/display.html:182 templates/web/fixmystreet/report/new/fill_in_details_form.html:210 +#: templates/web/bromley/report/display.html:148 templates/web/bromley/report/new/fill_in_details_form.html:189 templates/web/fixmystreet/auth/general.html:61 templates/web/fixmystreet/report/new/fill_in_details_form.html:221 templates/web/fixmystreet/report/update-form.html:120 msgid "Enter a password" msgstr "" -#: templates/web/default/index.html:33 templates/web/emptyhomes/index.html:58 templates/web/fixmystreet/index.html:46 +#: templates/web/default/index-steps.html:11 templates/web/emptyhomes/index.html:58 msgid "Enter details of the problem" msgstr "" @@ -721,14 +729,10 @@ msgstr "" msgid "FixMyStreet" msgstr "" -#: templates/web/default/admin/header.html:13 +#: templates/web/default/admin/header.html:10 msgid "FixMyStreet admin:" msgstr "" -#: templates/web/default/admin/header.html:3 -msgid "FixMyStreet administration" -msgstr "" - #: templates/web/default/alert/index.html:11 msgid "" "FixMyStreet has a variety of RSS feeds and email alerts for local problems, including\n" @@ -746,7 +750,7 @@ msgid "" "for the county council." msgstr "" -#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:82 templates/web/default/admin/index.html:36 templates/web/default/admin/report_edit.html:18 templates/web/default/admin/report_edit.html:20 templates/web/default/dashboard/index.html:138 templates/web/default/dashboard/index.html:140 templates/web/default/report/display.html:79 templates/web/default/report/display.html:81 templates/web/fixmystreet/report/banner.html:12 templates/web/fixmystreet/report/display.html:90 templates/web/fixmystreet/report/display.html:92 +#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:82 templates/web/default/admin/index.html:36 templates/web/default/admin/report_edit.html:18 templates/web/default/admin/report_edit.html:20 templates/web/default/dashboard/index.html:138 templates/web/default/dashboard/index.html:140 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:32 templates/web/fixmystreet/report/banner.html:12 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:30 msgid "Fixed" msgstr "" @@ -770,7 +774,7 @@ msgstr "" msgid "Flag user" msgstr "" -#: templates/web/default/admin/search_users.html:15 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1037 templates/web/default/admin/search_users.html:15 msgid "Flagged" msgstr "" @@ -778,7 +782,7 @@ msgstr "" msgid "Flagged:" msgstr "" -#: templates/web/default/reports/_ward-list.html:3 templates/web/emptyhomes/reports/council.html:19 templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/default/reports/_ward-list.html:3 templates/web/emptyhomes/reports/body.html:19 templates/web/fixmystreet/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "" @@ -786,7 +790,7 @@ msgstr "" msgid "For council(s):" msgstr "" -#: templates/web/fixmystreet/report/display.html:164 templates/web/fixmystreet/report/new/fill_in_details_form.html:175 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:186 templates/web/fixmystreet/report/update-form.html:102 msgid "Forgotten your password?" msgstr "" @@ -802,7 +806,7 @@ msgstr "" msgid "GeoRSS on Google Maps" msgstr "" -#: templates/web/bromley/report/display.html:30 templates/web/fixmystreet/report/display.html:27 +#: templates/web/bromley/report/display.html:30 templates/web/fixmystreet/report/display.html:31 msgid "Get updates" msgstr "" @@ -818,7 +822,7 @@ msgstr "" msgid "Give me an RSS feed" msgstr "" -#: templates/web/default/alert/index.html:34 templates/web/default/around/postcode_form.html:8 templates/web/emptyhomes/index.html:47 templates/web/fixmystreet/around/postcode_form.html:24 +#: templates/web/default/alert/index.html:34 templates/web/default/around/postcode_form.html:8 templates/web/emptyhomes/index.html:47 templates/web/fixmystreet/around/postcode_form.html:21 msgid "Go" msgstr "" @@ -842,7 +846,7 @@ msgstr "" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "" -#: templates/web/barnet/footer.html:24 templates/web/bromley/footer.html:25 templates/web/bromley/header.html:81 templates/web/default/footer.html:15 templates/web/emptyhomes/header.html:28 templates/web/fiksgatami/footer.html:9 templates/web/fiksgatami/nn/footer.html:9 templates/web/fixmybarangay/footer.html:24 templates/web/fixmystreet/footer.html:53 templates/web/reading/footer.html:10 +#: templates/web/barnet/footer.html:24 templates/web/bromley/footer.html:25 templates/web/bromley/header.html:81 templates/web/default/footer.html:15 templates/web/emptyhomes/header.html:28 templates/web/fiksgatami/footer.html:9 templates/web/fiksgatami/nn/footer.html:9 templates/web/fixmybarangay/footer.html:24 templates/web/fixmystreet/footer.html:53 templates/web/reading/footer.html:10 templates/web/stevenage/footer.html:47 templates/web/zurich/footer.html:14 msgid "Help" msgstr "" @@ -850,7 +854,7 @@ msgstr "" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "" -#: templates/web/barnet/header.html:70 templates/web/bromley/header.html:64 templates/web/bromley/header.html:99 templates/web/fixmybarangay/header.html:66 templates/web/fixmystreet/header.html:47 templates/web/zurich/header.html:47 +#: templates/web/barnet/header.html:70 templates/web/bromley/header.html:64 templates/web/bromley/header.html:99 templates/web/fixmybarangay/header.html:64 templates/web/fixmystreet/header.html:49 templates/web/stevenage/header.html:97 templates/web/zurich/header.html:47 msgid "Hi %s" msgstr "" @@ -870,7 +874,7 @@ msgstr "" msgid "History" msgstr "" -#: templates/web/default/index.html:28 templates/web/emptyhomes/index.html:53 templates/web/fixmystreet/index.html:36 +#: templates/web/default/index-steps.html:1 templates/web/emptyhomes/index.html:53 msgid "How to report a problem" msgstr "" @@ -921,7 +925,7 @@ msgstr "" msgid "Illegal feed selection" msgstr "" -#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:82 templates/web/default/admin/report_edit.html:18 templates/web/default/admin/report_edit.html:20 templates/web/default/dashboard/index.html:138 templates/web/default/dashboard/index.html:140 templates/web/default/report/display.html:79 templates/web/default/report/display.html:81 templates/web/fixmystreet/report/display.html:90 templates/web/fixmystreet/report/display.html:92 +#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:82 templates/web/default/admin/report_edit.html:18 templates/web/default/admin/report_edit.html:20 templates/web/default/dashboard/index.html:138 templates/web/default/dashboard/index.html:140 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:32 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:30 msgid "In Progress" msgstr "" @@ -945,7 +949,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: perllib/FixMyStreet/App/Controller/Admin.pm:952 msgid "Invalid end date" msgstr "" @@ -953,11 +957,11 @@ msgstr "" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:946 +#: perllib/FixMyStreet/App/Controller/Admin.pm:942 msgid "Invalid start date" msgstr "" -#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:81 templates/web/default/admin/report_edit.html:18 templates/web/default/admin/report_edit.html:19 templates/web/default/dashboard/index.html:138 templates/web/default/dashboard/index.html:139 templates/web/default/report/display.html:79 templates/web/default/report/display.html:80 templates/web/fixmystreet/report/display.html:90 templates/web/fixmystreet/report/display.html:91 +#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:81 templates/web/default/admin/report_edit.html:18 templates/web/default/admin/report_edit.html:19 templates/web/default/dashboard/index.html:138 templates/web/default/dashboard/index.html:139 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:31 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:29 msgid "Investigating" msgstr "" @@ -965,7 +969,7 @@ msgstr "" msgid "It is worth noting however that the process can sometimes be slow, especially if the property is in very poor repair or the owner is unwilling to act. In most cases it can take six months or more before you can expect to see anything change and sometimes there may be considerable barries to a property being brought back into use. This doesn’t mean the council isn’t doing anything. We encourage councils to update the website so you can see what is happening. It may be a long process, but you reporting your concerns about this property to the council is a valuable first step." msgstr "" -#: templates/web/bromley/report/display.html:166 templates/web/bromley/report/new/fill_in_details_form.html:209 templates/web/default/auth/general.html:44 templates/web/default/report/display.html:151 templates/web/default/report/new/fill_in_details_form.html:149 templates/web/fixmystreet/auth/general.html:46 templates/web/fixmystreet/report/display.html:160 templates/web/fixmystreet/report/new/fill_in_details_form.html:171 +#: templates/web/bromley/report/display.html:166 templates/web/bromley/report/new/fill_in_details_form.html:209 templates/web/default/auth/general.html:44 templates/web/default/report/new/fill_in_details_form.html:149 templates/web/default/report/update-form.html:102 templates/web/fixmystreet/auth/general.html:46 templates/web/fixmystreet/report/new/fill_in_details_form.html:182 templates/web/fixmystreet/report/update-form.html:98 msgid "Keep me signed in on this computer" msgstr "" @@ -985,15 +989,11 @@ msgstr "" msgid "Last update:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 -msgid "List Flagged" -msgstr "" - #: templates/web/default/admin/council_contacts.html:16 templates/web/default/admin/council_contacts.html:18 msgid "List all reported problems" msgstr "" -#: templates/web/bromley/report/new/fill_in_details_form.html:69 templates/web/default/report/new/fill_in_details_form.html:68 templates/web/fixmystreet/report/new/fill_in_details_form.html:75 +#: templates/web/bromley/report/new/fill_in_details_form.html:69 templates/web/default/report/new/fill_in_details_form.html:68 templates/web/fixmystreet/report/new/fill_in_details_form.html:75 templates/web/zurich/report/new/fill_in_details_form.html:69 msgid "Loading..." msgstr "" @@ -1005,11 +1005,11 @@ msgstr "" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "" -#: templates/web/barnet/footer.html:22 templates/web/bromley/footer.html:23 templates/web/bromley/header.html:79 templates/web/default/footer.html:13 templates/web/fiksgatami/footer.html:8 templates/web/fiksgatami/nn/footer.html:8 templates/web/fixmybarangay/footer.html:22 templates/web/fixmystreet/footer.html:51 templates/web/reading/footer.html:9 +#: templates/web/barnet/footer.html:22 templates/web/bromley/footer.html:23 templates/web/bromley/header.html:79 templates/web/default/footer.html:13 templates/web/fiksgatami/footer.html:8 templates/web/fiksgatami/nn/footer.html:8 templates/web/fixmybarangay/footer.html:22 templates/web/fixmystreet/footer.html:51 templates/web/reading/footer.html:9 templates/web/stevenage/footer.html:45 msgid "Local alerts" msgstr "" -#: templates/web/default/index.html:32 templates/web/emptyhomes/index.html:57 templates/web/fixmystreet/index.html:45 +#: templates/web/default/index-steps.html:10 templates/web/emptyhomes/index.html:57 msgid "Locate the problem on a map of the area" msgstr "" @@ -1037,7 +1037,7 @@ msgstr "" msgid "More problems nearby" msgstr "" -#: templates/web/default/admin/list_flagged.html:11 templates/web/default/admin/list_flagged.html:34 templates/web/default/admin/list_updates.html:7 templates/web/default/admin/search_reports.html:14 templates/web/default/admin/search_users.html:12 templates/web/default/reports/index.html:15 templates/web/emptyhomes/reports/index.html:10 templates/web/fiksgatami/nn/reports/index.html:9 templates/web/fiksgatami/reports/index.html:9 templates/web/fixmystreet/auth/general.html:56 templates/web/fixmystreet/report/display.html:199 templates/web/fixmystreet/report/new/fill_in_details_form.html:119 templates/web/fixmystreet/report/new/fill_in_details_form.html:186 +#: templates/web/default/admin/list_flagged.html:11 templates/web/default/admin/list_flagged.html:34 templates/web/default/admin/list_updates.html:7 templates/web/default/admin/search_reports.html:14 templates/web/default/admin/search_users.html:12 templates/web/default/reports/index.html:15 templates/web/emptyhomes/reports/index.html:10 templates/web/fiksgatami/nn/reports/index.html:9 templates/web/fiksgatami/reports/index.html:9 templates/web/fixmybarangay/reports/index.html:19 templates/web/fixmystreet/auth/general.html:56 templates/web/fixmystreet/report/new/fill_in_details_form.html:120 templates/web/fixmystreet/report/new/fill_in_details_form.html:197 templates/web/fixmystreet/report/update-form.html:134 templates/web/zurich/report/new/fill_in_details_form.html:118 msgid "Name" msgstr "" @@ -1049,7 +1049,7 @@ msgstr "" msgid "Navigation" msgstr "" -#: perllib/FixMyStreet/Geocode/OSM.pm:161 +#: perllib/FixMyStreet/Geocode/OSM.pm:166 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "" @@ -1057,7 +1057,7 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:406 perllib/FixMyStreet/Cobrand/Default.pm:446 +#: perllib/FixMyStreet/Cobrand/Default.pm:407 perllib/FixMyStreet/Cobrand/Default.pm:447 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -1071,7 +1071,7 @@ msgstr "" msgid "Nearly Done! Now check your email..." msgstr "" -#: templates/web/default/reports/index.html:16 +#: templates/web/default/reports/index.html:16 templates/web/fixmybarangay/reports/index.html:20 msgid "New <br>problems" msgstr "" @@ -1175,7 +1175,7 @@ msgstr "" msgid "No problems have been reported yet." msgstr "" -#: templates/web/fixmystreet/report/_support.html:3 +#: templates/web/default/report/_support.html:3 msgid "No supporters" msgstr "" @@ -1191,7 +1191,7 @@ msgstr "" msgid "Not reported before" msgstr "" -#: templates/web/default/report/_main.html:11 templates/web/emptyhomes/report/display.html:24 templates/web/fixmystreet/report/_main.html:13 +#: templates/web/default/report/_main.html:14 templates/web/emptyhomes/report/display.html:24 msgid "Not reported to council" msgstr "" @@ -1211,7 +1211,7 @@ msgstr "" msgid "Note: <strong>%s</strong>" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:153 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:164 msgid "Now to submit your report…" msgstr "" @@ -1219,11 +1219,11 @@ msgstr "" msgid "Now to submit your report… do you have a FixMyStreet password?" msgstr "" -#: templates/web/fixmystreet/report/display.html:143 +#: templates/web/fixmystreet/report/update-form.html:81 msgid "Now to submit your update…" msgstr "" -#: templates/web/default/report/display.html:133 +#: templates/web/default/report/update-form.html:84 msgid "Now to submit your update… do you have a FixMyStreet password?" msgstr "" @@ -1231,7 +1231,7 @@ msgstr "" msgid "Offensive? Unsuitable? Tell us" msgstr "" -#: templates/web/default/reports/index.html:18 +#: templates/web/default/reports/index.html:18 templates/web/fixmybarangay/reports/index.html:22 msgid "Old / unknown <br>problems" msgstr "" @@ -1243,11 +1243,11 @@ msgstr "" msgid "Old state" msgstr "" -#: templates/web/default/reports/index.html:20 +#: templates/web/default/reports/index.html:20 templates/web/fixmybarangay/reports/index.html:24 msgid "Older <br>fixed" msgstr "" -#: templates/web/default/reports/index.html:17 +#: templates/web/default/reports/index.html:17 templates/web/fixmybarangay/reports/index.html:21 msgid "Older <br>problems" msgstr "" @@ -1259,7 +1259,7 @@ msgstr "" msgid "Older problems" msgstr "" -#: templates/web/bromley/report/display.html:80 templates/web/default/admin/report_edit.html:18 templates/web/default/admin/update_edit.html:19 templates/web/default/dashboard/index.html:138 templates/web/default/report/display.html:79 templates/web/fixmystreet/report/display.html:90 +#: templates/web/bromley/report/display.html:80 templates/web/default/admin/report_edit.html:18 templates/web/default/admin/update_edit.html:19 templates/web/default/dashboard/index.html:138 templates/web/default/report/update-form.html:30 templates/web/fixmystreet/report/update-form.html:28 msgid "Open" msgstr "" @@ -1287,7 +1287,7 @@ msgstr "" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1008 perllib/FixMyStreet/App/Controller/Report/New.pm:658 perllib/FixMyStreet/App/Controller/Report/New.pm:659 perllib/FixMyStreet/DB/Result/Problem.pm:505 perllib/FixMyStreet/DB/Result/Problem.pm:515 perllib/FixMyStreet/DB/Result/Problem.pm:525 perllib/FixMyStreet/DB/Result/Problem.pm:537 perllib/FixMyStreet/DB/ResultSet/Problem.pm:331 perllib/FixMyStreet/DB/ResultSet/Problem.pm:340 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1006 perllib/FixMyStreet/App/Controller/Report/New.pm:656 perllib/FixMyStreet/App/Controller/Report/New.pm:657 perllib/FixMyStreet/DB/Result/Problem.pm:505 perllib/FixMyStreet/DB/Result/Problem.pm:515 perllib/FixMyStreet/DB/Result/Problem.pm:525 perllib/FixMyStreet/DB/Result/Problem.pm:537 perllib/FixMyStreet/DB/ResultSet/Problem.pm:331 perllib/FixMyStreet/DB/ResultSet/Problem.pm:340 msgid "Other" msgstr "" @@ -1307,7 +1307,7 @@ msgstr "" msgid "Partial" msgstr "" -#: templates/web/bromley/report/display.html:145 templates/web/bromley/report/new/fill_in_details_form.html:186 templates/web/fixmystreet/auth/general.html:59 templates/web/fixmystreet/report/display.html:179 templates/web/fixmystreet/report/new/fill_in_details_form.html:207 +#: templates/web/bromley/report/display.html:145 templates/web/bromley/report/new/fill_in_details_form.html:186 templates/web/fixmystreet/auth/general.html:59 templates/web/fixmystreet/report/new/fill_in_details_form.html:218 templates/web/fixmystreet/report/update-form.html:117 msgid "Password (optional)" msgstr "" @@ -1315,7 +1315,7 @@ msgstr "" msgid "Password:" msgstr "" -#: templates/web/bromley/report/new/fill_in_details_form.html:136 templates/web/bromley/report/new/fill_in_details_form.html:183 templates/web/fixmystreet/report/new/fill_in_details_form.html:137 templates/web/fixmystreet/report/new/fill_in_details_form.html:204 +#: templates/web/bromley/report/new/fill_in_details_form.html:136 templates/web/bromley/report/new/fill_in_details_form.html:183 templates/web/fixmystreet/report/new/fill_in_details_form.html:148 templates/web/fixmystreet/report/new/fill_in_details_form.html:215 templates/web/zurich/report/new/fill_in_details_form.html:124 msgid "Phone number (optional)" msgstr "" @@ -1323,11 +1323,11 @@ msgstr "" msgid "Phone:" msgstr "" -#: templates/web/bromley/report/display.html:109 templates/web/bromley/report/new/fill_in_details_form.html:104 templates/web/fixmystreet/report/display.html:119 templates/web/fixmystreet/report/new/fill_in_details_form.html:110 +#: templates/web/bromley/report/display.html:109 templates/web/bromley/report/new/fill_in_details_form.html:104 templates/web/fixmystreet/report/new/fill_in_details_form.html:92 templates/web/fixmystreet/report/update-form.html:57 templates/web/zurich/report/new/fill_in_details_form.html:86 msgid "Photo" msgstr "" -#: templates/web/default/questionnaire/index.html:95 templates/web/default/report/display.html:109 templates/web/default/report/new/fill_in_details_form.html:102 templates/web/fixmystreet/questionnaire/index.html:90 +#: templates/web/default/questionnaire/index.html:95 templates/web/default/report/new/fill_in_details_form.html:102 templates/web/default/report/update-form.html:60 templates/web/fixmystreet/questionnaire/index.html:90 msgid "Photo:" msgstr "" @@ -1335,7 +1335,7 @@ msgstr "" msgid "Photos of recent nearby reports" msgstr "" -#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:81 templates/web/default/admin/report_edit.html:18 templates/web/default/admin/report_edit.html:19 templates/web/default/dashboard/index.html:138 templates/web/default/dashboard/index.html:139 templates/web/default/report/display.html:79 templates/web/default/report/display.html:80 templates/web/fixmystreet/report/display.html:90 templates/web/fixmystreet/report/display.html:91 +#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:81 templates/web/default/admin/report_edit.html:18 templates/web/default/admin/report_edit.html:19 templates/web/default/dashboard/index.html:138 templates/web/default/dashboard/index.html:139 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:31 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:29 msgid "Planned" msgstr "" @@ -1359,7 +1359,7 @@ msgstr "" msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:824 perllib/FixMyStreet/App/Controller/Report/New.pm:831 perllib/FixMyStreet/App/Controller/Report/New.pm:850 perllib/FixMyStreet/App/Controller/Report/New.pm:893 perllib/FixMyStreet/DB/Result/Problem.pm:355 templates/web/default/js/validation_strings.html:9 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:822 perllib/FixMyStreet/App/Controller/Report/New.pm:829 perllib/FixMyStreet/App/Controller/Report/New.pm:848 perllib/FixMyStreet/App/Controller/Report/New.pm:891 perllib/FixMyStreet/DB/Result/Problem.pm:355 templates/web/default/js/validation_strings.html:9 msgid "Please choose a category" msgstr "" @@ -1379,7 +1379,7 @@ msgid "" msgstr "" #: templates/web/default/report/new/notes.html:7 templates/web/fixmystreet/report/new/notes.html:6 -msgid "Please do not be abusive — abusing your council devalues the service for all users." +msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" #: perllib/FixMyStreet/DB/Result/Comment.pm:146 templates/web/default/js/validation_strings.html:2 @@ -1410,7 +1410,7 @@ msgstr "" msgid "Please enter your email" msgstr "" -#: templates/web/bromley/report/new/fill_in_details_form.html:149 templates/web/fixmystreet/report/new/fill_in_details_form.html:150 +#: templates/web/bromley/report/new/fill_in_details_form.html:149 templates/web/fixmystreet/report/new/fill_in_details_form.html:161 templates/web/zurich/report/new/fill_in_details_form.html:110 msgid "Please enter your email address" msgstr "" @@ -1444,7 +1444,7 @@ msgid "" "to read, as does a lack of punctuation." msgstr "" -#: templates/web/default/report/new/fill_in_details_text.html:1 templates/web/default/report/new/fill_in_details_text.html:11 templates/web/fixmybarangay/report/new/fill_in_details_text.html:1 templates/web/fixmybarangay/report/new/fill_in_details_text.html:10 templates/web/fixmystreet/report/new/fill_in_details_text.html:1 templates/web/fixmystreet/report/new/fill_in_details_text.html:11 +#: templates/web/default/report/new/fill_in_details_text.html:1 templates/web/default/report/new/fill_in_details_text.html:11 templates/web/fixmybarangay/report/new/fill_in_details_text.html:1 templates/web/fixmybarangay/report/new/fill_in_details_text.html:10 templates/web/fixmystreet/report/new/fill_in_details_text.html:1 templates/web/fixmystreet/report/new/fill_in_details_text.html:8 msgid "Please fill in details of the problem below." msgstr "" @@ -1463,11 +1463,11 @@ msgid "" "photo of the problem if you have one), etc." msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:70 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:70 templates/web/zurich/report/new/fill_in_details_form.html:64 msgid "Please fill in details of the problem." msgstr "" -#: templates/web/bromley/report/new/fill_in_details_form.html:28 templates/web/default/report/new/fill_in_details_form.html:27 templates/web/fixmystreet/report/new/fill_in_details_form.html:35 +#: templates/web/bromley/report/new/fill_in_details_form.html:28 templates/web/default/report/new/fill_in_details_form.html:27 templates/web/fixmystreet/report/new/fill_in_details_form.html:35 templates/web/zurich/report/new/fill_in_details_form.html:35 msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "" @@ -1479,7 +1479,7 @@ msgstr "" msgid "Please note that updates are not sent to the council." msgstr "" -#: templates/web/default/report/display.html:56 +#: templates/web/default/report/update-form.html:7 msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" msgstr "" @@ -1487,7 +1487,7 @@ msgstr "" msgid "Please note that updates are not sent to the relevant department. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" msgstr "" -#: templates/web/bromley/report/new/fill_in_details_form.html:23 templates/web/default/report/new/fill_in_details_form.html:5 templates/web/fixmystreet/report/new/fill_in_details_form.html:26 +#: templates/web/bromley/report/new/fill_in_details_form.html:23 templates/web/default/report/new/fill_in_details_form.html:5 templates/web/fixmystreet/report/new/fill_in_details_form.html:26 templates/web/zurich/report/new/fill_in_details_form.html:26 msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit." msgstr "" @@ -1535,11 +1535,11 @@ msgstr "" msgid "Please write a message" msgstr "" -#: templates/web/bromley/report/display.html:70 templates/web/fixmystreet/report/display.html:85 +#: templates/web/bromley/report/display.html:70 templates/web/fixmystreet/report/update-form.html:23 msgid "Please write your update here" msgstr "" -#: templates/web/bromley/report/display.html:121 templates/web/bromley/report/display.html:149 templates/web/bromley/report/display.html:161 templates/web/default/contact/index.html:93 templates/web/default/report/display.html:119 templates/web/default/report/display.html:156 templates/web/default/report/display.html:178 templates/web/fixmystreet/contact/index.html:93 templates/web/fixmystreet/report/display.html:131 templates/web/fixmystreet/report/display.html:155 templates/web/fixmystreet/report/display.html:183 +#: templates/web/bromley/report/display.html:121 templates/web/bromley/report/display.html:149 templates/web/bromley/report/display.html:161 templates/web/default/contact/index.html:93 templates/web/default/report/update-form.html:107 templates/web/default/report/update-form.html:129 templates/web/default/report/update-form.html:70 templates/web/fixmystreet/contact/index.html:93 templates/web/fixmystreet/report/update-form.html:121 templates/web/fixmystreet/report/update-form.html:69 templates/web/fixmystreet/report/update-form.html:93 msgid "Post" msgstr "" @@ -1579,7 +1579,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:833 +#: perllib/FixMyStreet/App/Controller/Admin.pm:849 msgid "Problem marked as open." msgstr "" @@ -1595,7 +1595,7 @@ msgstr "" msgid "Problems in this area" msgstr "" -#: templates/web/bromley/report/display.html:31 templates/web/fixmystreet/around/tabbed_lists.html:4 templates/web/fixmystreet/report/display.html:31 +#: templates/web/bromley/report/display.html:31 templates/web/fixmystreet/around/tabbed_lists.html:4 templates/web/fixmystreet/report/display.html:35 msgid "Problems nearby" msgstr "" @@ -1611,7 +1611,7 @@ msgstr "" msgid "Problems within %.1fkm of this location" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:611 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:95 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:162 perllib/FixMyStreet/Cobrand/UK.pm:231 +#: perllib/FixMyStreet/Cobrand/Default.pm:612 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:95 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:162 perllib/FixMyStreet/Cobrand/UK.pm:231 msgid "Problems within %s" msgstr "" @@ -1619,7 +1619,7 @@ msgstr "" msgid "Problems within %s ward" msgstr "" -#: templates/web/default/reports/council.html:0 templates/web/default/reports/council.html:29 +#: templates/web/default/reports/body.html:0 templates/web/default/reports/body.html:29 msgid "Problems within %s, FixMyStreet" msgstr "" @@ -1631,7 +1631,7 @@ msgstr "" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:616 msgid "Property type:" msgstr "" @@ -1639,7 +1639,7 @@ msgstr "" msgid "Provide a title" msgstr "" -#: templates/web/bromley/report/display.html:57 templates/web/default/report/display.html:51 templates/web/fixmystreet/report/display.html:66 +#: templates/web/bromley/report/display.html:57 templates/web/default/report/update-form.html:3 templates/web/fixmystreet/report/update-form.html:4 msgid "Provide an update" msgstr "" @@ -1647,7 +1647,7 @@ msgstr "" msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports." msgstr "" -#: templates/web/bromley/report/display.html:142 templates/web/default/report/display.html:175 templates/web/default/report/new/fill_in_details_form.html:173 templates/web/fixmystreet/report/display.html:176 templates/web/fixmystreet/report/new/fill_in_details_form.html:201 +#: templates/web/bromley/report/display.html:142 templates/web/default/report/new/fill_in_details_form.html:173 templates/web/default/report/update-form.html:126 templates/web/fixmystreet/report/new/fill_in_details_form.html:212 templates/web/fixmystreet/report/update-form.html:114 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" @@ -1671,7 +1671,7 @@ msgstr "" msgid "Questionnaire filled in by problem reporter" msgstr "" -#: templates/web/bromley/report/display.html:37 templates/web/default/alert/_list.html:21 templates/web/default/around/display_location.html:1 templates/web/default/around/display_location.html:3 templates/web/default/report/display.html:42 templates/web/default/reports/_rss.html:1 templates/web/fixmystreet/alert/_list.html:22 templates/web/fixmystreet/alert/updates.html:9 templates/web/fixmystreet/report/display.html:45 +#: templates/web/bromley/report/display.html:37 templates/web/default/alert/_list.html:21 templates/web/default/around/display_location.html:1 templates/web/default/around/display_location.html:3 templates/web/default/report/display.html:42 templates/web/default/reports/_rss.html:1 templates/web/fixmystreet/alert/_list.html:22 templates/web/fixmystreet/alert/updates.html:9 templates/web/fixmystreet/report/display.html:49 msgid "RSS feed" msgstr "" @@ -1699,7 +1699,7 @@ msgstr "" msgid "RSS feed of problems in this %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:612 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:96 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161 perllib/FixMyStreet/Cobrand/UK.pm:238 +#: perllib/FixMyStreet/Cobrand/Default.pm:613 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:96 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161 perllib/FixMyStreet/Cobrand/UK.pm:238 msgid "RSS feed of problems within %s" msgstr "" @@ -1711,11 +1711,11 @@ msgstr "" msgid "RSS feed of recent local problems" msgstr "" -#: templates/web/bromley/report/display.html:37 templates/web/default/report/display.html:42 templates/web/fixmystreet/alert/updates.html:9 templates/web/fixmystreet/report/display.html:45 +#: templates/web/bromley/report/display.html:37 templates/web/default/report/display.html:42 templates/web/fixmystreet/alert/updates.html:9 templates/web/fixmystreet/report/display.html:49 msgid "RSS feed of updates to this problem" msgstr "" -#: templates/web/bromley/report/display.html:39 templates/web/default/alert/updates.html:9 templates/web/default/report/display.html:33 templates/web/fixmystreet/alert/updates.html:14 templates/web/fixmystreet/report/display.html:47 +#: templates/web/bromley/report/display.html:39 templates/web/default/alert/updates.html:9 templates/web/default/report/display.html:33 templates/web/fixmystreet/alert/updates.html:14 templates/web/fixmystreet/report/display.html:51 msgid "Receive email when updates are left on this problem." msgstr "" @@ -1723,7 +1723,7 @@ msgstr "" msgid "Recent local problems, FixMyStreet" msgstr "" -#: templates/web/default/reports/index.html:19 +#: templates/web/default/reports/index.html:19 templates/web/fixmybarangay/reports/index.html:23 msgid "Recently <br>fixed" msgstr "" @@ -1731,7 +1731,7 @@ msgstr "" msgid "Recently fixed" msgstr "" -#: templates/web/default/index.html:50 templates/web/fixmystreet/index.html:68 +#: templates/web/default/index.html:37 templates/web/fixmystreet/index.html:45 msgid "Recently reported problems" msgstr "" @@ -1755,11 +1755,11 @@ msgstr "" msgid "Report Empty Homes" msgstr "" -#: templates/web/barnet/footer.html:16 templates/web/bromley/footer.html:17 templates/web/default/footer.html:7 templates/web/emptyhomes/header.html:27 templates/web/fiksgatami/footer.html:5 templates/web/fiksgatami/nn/footer.html:5 templates/web/fixmystreet/footer.html:45 templates/web/reading/footer.html:6 +#: templates/web/barnet/footer.html:16 templates/web/bromley/footer.html:17 templates/web/default/footer.html:7 templates/web/emptyhomes/header.html:27 templates/web/fiksgatami/footer.html:5 templates/web/fiksgatami/nn/footer.html:5 templates/web/fixmystreet/footer.html:45 templates/web/reading/footer.html:6 templates/web/stevenage/footer.html:39 templates/web/zurich/footer.html:10 msgid "Report a problem" msgstr "" -#: templates/web/bromley/report/display.html:28 templates/web/fixmystreet/report/display.html:26 +#: templates/web/bromley/report/display.html:28 templates/web/fixmystreet/report/display.html:29 msgid "Report abuse" msgstr "" @@ -1767,11 +1767,11 @@ msgstr "" msgid "Report empty properties" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:277 +#: perllib/FixMyStreet/App/Controller/Rss.pm:286 msgid "Report on %s" msgstr "" -#: templates/web/default/index.html:15 templates/web/fixmystreet/around/postcode_form.html:9 +#: templates/web/default/index.html:15 templates/web/fixmystreet/around/intro.html:1 templates/web/stevenage/around/intro.html:1 templates/web/zurich/around/intro.html:1 msgid "Report, view, or discuss local problems" msgstr "" @@ -1819,10 +1819,14 @@ msgstr "" msgid "Reported in the %s category by %s at %s" msgstr "" -#: templates/web/default/around/around_index.html:1 templates/web/default/report/new/fill_in_details.html:0 templates/web/default/report/new/fill_in_details.html:3 templates/web/default/report/new/fill_in_details_form.html:1 templates/web/fixmystreet/around/around_index.html:2 templates/web/fixmystreet/report/new/fill_in_details.html:0 templates/web/fixmystreet/report/new/fill_in_details.html:5 templates/web/fixmystreet/report/new/fill_in_details_form.html:2 +#: templates/web/default/around/around_index.html:1 templates/web/default/report/new/fill_in_details.html:0 templates/web/default/report/new/fill_in_details.html:3 templates/web/default/report/new/fill_in_details_form.html:1 templates/web/fixmystreet/around/around_index.html:2 templates/web/fixmystreet/report/new/fill_in_details.html:0 templates/web/fixmystreet/report/new/fill_in_details.html:5 templates/web/fixmystreet/report/new/fill_in_details_form.html:2 templates/web/zurich/report/new/fill_in_details_form.html:2 msgid "Reporting a problem" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1033 +msgid "Reports" +msgstr "" + #: templates/web/default/around/tabbed_lists.html:3 msgid "Reports on and around the map" msgstr "" @@ -1831,11 +1835,11 @@ msgstr "" msgid "Resend report" msgstr "" -#: perllib/FixMyStreet/Geocode/OSM.pm:168 +#: perllib/FixMyStreet/Geocode/OSM.pm:173 msgid "Road operator for this named road (derived from road reference number and type): %s" msgstr "" -#: perllib/FixMyStreet/Geocode/OSM.pm:165 +#: perllib/FixMyStreet/Geocode/OSM.pm:170 msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" @@ -1843,23 +1847,15 @@ msgstr "" msgid "Save changes" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 -msgid "Search Abuse" -msgstr "" - -#: templates/web/default/admin/search_abuse.html:1 -msgid "Search Abuse Table" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Admin.pm:1037 templates/web/default/admin/list_flagged.html:1 templates/web/default/admin/search_reports.html:1 +#: templates/web/default/admin/list_flagged.html:1 templates/web/default/admin/search_reports.html:1 msgid "Search Reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1040 templates/web/default/admin/search_users.html:1 +#: templates/web/default/admin/search_users.html:1 msgid "Search Users" msgstr "" -#: templates/web/default/admin/search_abuse.html:4 templates/web/default/admin/search_reports.html:5 templates/web/default/admin/search_users.html:5 +#: templates/web/default/admin/search_reports.html:5 templates/web/default/admin/search_users.html:5 msgid "Search:" msgstr "" @@ -1867,7 +1863,7 @@ msgstr "" msgid "Select which type of alert you'd like and click the button for an RSS feed, or enter your email address to subscribe to an email alert." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:626 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 msgid "Sent to %s %s later" msgstr "" @@ -1879,7 +1875,7 @@ msgstr "" msgid "Service:" msgstr "" -#: templates/web/fixmystreet/report/display.html:29 +#: templates/web/fixmystreet/report/display.html:33 msgid "Share" msgstr "" @@ -1900,7 +1896,7 @@ msgid "" " significant contribution to the supply of affordable homes in Wales." msgstr "" -#: templates/web/bromley/report/display.html:203 templates/web/bromley/report/new/fill_in_details_form.html:129 templates/web/bromley/report/new/fill_in_details_form.html:175 templates/web/default/report/display.html:208 templates/web/default/report/new/fill_in_details_form.html:210 templates/web/fixmystreet/report/display.html:207 templates/web/fixmystreet/report/new/fill_in_details_form.html:128 templates/web/fixmystreet/report/new/fill_in_details_form.html:196 +#: templates/web/bromley/report/display.html:203 templates/web/bromley/report/new/fill_in_details_form.html:129 templates/web/bromley/report/new/fill_in_details_form.html:175 templates/web/default/report/new/fill_in_details_form.html:210 templates/web/default/report/update-form.html:155 templates/web/fixmystreet/report/new/fill_in_details_form.html:139 templates/web/fixmystreet/report/new/fill_in_details_form.html:207 templates/web/fixmystreet/report/update-form.html:142 msgid "Show my name publicly" msgstr "" @@ -1912,7 +1908,7 @@ msgstr "" msgid "Show pins" msgstr "" -#: templates/web/default/auth/general.html:3 templates/web/default/auth/general.html:49 templates/web/fixmybarangay/header.html:70 templates/web/fixmystreet/auth/general.html:3 templates/web/fixmystreet/auth/general.html:42 templates/web/fixmystreet/auth/general.html:62 templates/web/fixmystreet/header.html:51 templates/web/zurich/header.html:51 +#: templates/web/default/auth/general.html:3 templates/web/default/auth/general.html:49 templates/web/fixmybarangay/header.html:68 templates/web/fixmystreet/auth/general.html:3 templates/web/fixmystreet/auth/general.html:42 templates/web/fixmystreet/auth/general.html:62 templates/web/fixmystreet/header.html:53 templates/web/stevenage/header.html:101 templates/web/zurich/header.html:51 msgid "Sign in" msgstr "" @@ -1924,7 +1920,7 @@ msgstr "" msgid "Sign in or create an account" msgstr "" -#: templates/web/bromley/auth/sign_out.html:1 templates/web/default/auth/sign_out.html:1 templates/web/default/header.html:30 templates/web/emptyhomes/header.html:41 templates/web/fiksgatami/header.html:22 templates/web/fiksgatami/nn/header.html:22 templates/web/lichfielddc/header.html:177 templates/web/reading/header.html:33 +#: templates/web/bromley/auth/sign_out.html:1 templates/web/default/auth/sign_out.html:1 templates/web/default/header.html:30 templates/web/emptyhomes/header.html:41 templates/web/fiksgatami/header.html:22 templates/web/fiksgatami/nn/header.html:22 templates/web/fixmybarangay/auth/sign_out.html:1 templates/web/lichfielddc/header.html:177 templates/web/reading/header.html:33 msgid "Sign out" msgstr "" @@ -1956,11 +1952,11 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:213 perllib/FixMyStreet/Geocode.pm:27 perllib/FixMyStreet/Geocode/Bing.pm:51 perllib/FixMyStreet/Geocode/Google.pm:69 perllib/FixMyStreet/Geocode/OSM.pm:61 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:211 perllib/FixMyStreet/Geocode.pm:28 perllib/FixMyStreet/Geocode/Bing.pm:58 perllib/FixMyStreet/Geocode/Google.pm:74 perllib/FixMyStreet/Geocode/OSM.pm:66 msgid "Sorry, we could not find that location." msgstr "" -#: perllib/FixMyStreet/Geocode/Bing.pm:46 perllib/FixMyStreet/Geocode/Google.pm:64 +#: perllib/FixMyStreet/Geocode/Bing.pm:53 perllib/FixMyStreet/Geocode/Google.pm:69 perllib/FixMyStreet/Geocode/Zurich.pm:82 msgid "Sorry, we could not parse that location. Please try again." msgstr "" @@ -1980,15 +1976,15 @@ msgstr "" msgid "Start month:" msgstr "" -#: templates/web/bromley/report/display.html:78 templates/web/default/admin/list_flagged.html:18 templates/web/default/admin/list_updates.html:6 templates/web/default/admin/search_reports.html:21 templates/web/fixmystreet/report/display.html:88 +#: templates/web/bromley/report/display.html:78 templates/web/default/admin/list_flagged.html:18 templates/web/default/admin/list_updates.html:6 templates/web/default/admin/search_reports.html:21 templates/web/fixmystreet/report/update-form.html:26 msgid "State" msgstr "" -#: templates/web/default/admin/report_edit.html:17 templates/web/default/admin/update_edit.html:18 templates/web/default/report/display.html:77 +#: templates/web/default/admin/report_edit.html:17 templates/web/default/admin/update_edit.html:18 templates/web/default/report/update-form.html:28 msgid "State:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1043 templates/web/default/admin/stats.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1038 templates/web/default/admin/stats.html:1 msgid "Stats" msgstr "" @@ -2004,7 +2000,7 @@ msgstr "" msgid "Subject:" msgstr "" -#: templates/web/bromley/report/new/fill_in_details_form.html:140 templates/web/bromley/report/new/fill_in_details_form.html:190 templates/web/bromley/report/new/fill_in_details_form.html:204 templates/web/default/questionnaire/creator_fixed.html:19 templates/web/default/report/new/fill_in_details_form.html:114 templates/web/default/report/new/fill_in_details_form.html:154 templates/web/default/report/new/fill_in_details_form.html:176 templates/web/fixmystreet/report/new/fill_in_details_form.html:141 templates/web/fixmystreet/report/new/fill_in_details_form.html:166 templates/web/fixmystreet/report/new/fill_in_details_form.html:211 +#: templates/web/bromley/report/new/fill_in_details_form.html:140 templates/web/bromley/report/new/fill_in_details_form.html:190 templates/web/bromley/report/new/fill_in_details_form.html:204 templates/web/default/questionnaire/creator_fixed.html:19 templates/web/default/report/new/fill_in_details_form.html:114 templates/web/default/report/new/fill_in_details_form.html:154 templates/web/default/report/new/fill_in_details_form.html:176 templates/web/fixmystreet/report/new/fill_in_details_form.html:152 templates/web/fixmystreet/report/new/fill_in_details_form.html:177 templates/web/fixmystreet/report/new/fill_in_details_form.html:222 templates/web/zurich/report/new/fill_in_details_form.html:128 msgid "Submit" msgstr "" @@ -2016,7 +2012,7 @@ msgstr "" msgid "Submit questionnaire" msgstr "" -#: templates/web/bromley/report/display.html:44 templates/web/default/alert/updates.html:17 templates/web/default/report/display.html:38 templates/web/fixmystreet/alert/updates.html:23 templates/web/fixmystreet/report/display.html:52 +#: templates/web/bromley/report/display.html:44 templates/web/default/alert/updates.html:17 templates/web/default/report/display.html:38 templates/web/fixmystreet/alert/updates.html:23 templates/web/fixmystreet/report/display.html:56 msgid "Subscribe" msgstr "" @@ -2028,15 +2024,19 @@ msgstr "" msgid "Subscribe to an alert based upon what baranagay you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1035 templates/web/default/admin/index.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1031 templates/web/default/admin/index.html:1 msgid "Summary" msgstr "" -#: templates/web/default/reports/index.html:1 templates/web/emptyhomes/reports/index.html:1 templates/web/fiksgatami/nn/reports/index.html:1 templates/web/fiksgatami/reports/index.html:1 +#: templates/web/default/reports/index.html:1 templates/web/emptyhomes/reports/index.html:1 templates/web/fiksgatami/nn/reports/index.html:1 templates/web/fiksgatami/reports/index.html:1 templates/web/fixmybarangay/reports/index.html:1 msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1039 templates/web/default/admin/questionnaire.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1035 +msgid "Survey" +msgstr "" + +#: templates/web/default/admin/questionnaire.html:1 msgid "Survey Results" msgstr "" @@ -2096,11 +2096,11 @@ msgstr "" msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Council.pm:91 +#: perllib/FixMyStreet/App/Controller/Council.pm:90 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Location.pm:120 +#: perllib/FixMyStreet/App/Controller/Location.pm:121 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -2144,11 +2144,7 @@ msgid "The confirmation email <strong>may</strong> take a few minutes to arrive msgstr "" #: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 templates/web/fixmystreet/report/new/fill_in_details_text.html:3 -msgid "" -"The council won’t be able to help unless you leave as much\n" -"detail as you can. Please describe the exact location of the problem (e.g. on a\n" -"wall), what it is, how long it has been there, a description (and a photo of\n" -"the problem if you have one), etc." +msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." msgstr "" #: templates/web/fixmystreet/questionnaire/index.html:43 @@ -2167,7 +2163,7 @@ msgstr "" msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "" -#: perllib/FixMyStreet/Geocode/OSM.pm:160 +#: perllib/FixMyStreet/Geocode/OSM.pm:165 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap." msgstr "" @@ -2227,7 +2223,7 @@ msgstr "" msgid "The simplest alert is our geographic one:" msgstr "" -#: templates/web/barnet/report/new/councils_text_all.html:3 templates/web/default/report/new/councils_extra_text.html:1 templates/web/default/report/new/councils_text_some.html:10 templates/web/default/report/new/councils_text_some.html:11 templates/web/default/report/new/fill_in_details_form.html:17 templates/web/fixmystreet/report/new/fill_in_details_form.html:12 +#: templates/web/barnet/report/new/councils_text_all.html:3 templates/web/default/report/new/councils_extra_text.html:1 templates/web/default/report/new/councils_text_some.html:10 templates/web/default/report/new/councils_text_some.html:11 templates/web/default/report/new/fill_in_details_form.html:17 templates/web/fixmystreet/report/new/fill_in_details_form.html:12 templates/web/zurich/report/new/fill_in_details_form.html:12 msgid "The subject and details of the problem will be public, plus your name if you give us permission." msgstr "" @@ -2243,7 +2239,7 @@ msgstr "" msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:738 perllib/FixMyStreet/App/Controller/Report/Update.pm:134 templates/web/default/auth/general.html:23 templates/web/fixmystreet/auth/general.html:24 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:736 perllib/FixMyStreet/App/Controller/Report/Update.pm:134 templates/web/default/auth/general.html:23 templates/web/fixmystreet/auth/general.html:24 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "" @@ -2275,7 +2271,7 @@ msgstr "" msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:870 perllib/FixMyStreet/Cobrand/UK.pm:54 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:868 perllib/FixMyStreet/Cobrand/UK.pm:54 msgid "This information is required" msgstr "" @@ -2283,14 +2279,18 @@ msgstr "" msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." msgstr "" -#: templates/web/emptyhomes/reports/council.html:58 +#: templates/web/emptyhomes/reports/body.html:58 msgid "This is a summary of all reports for one %s." msgstr "" -#: templates/web/emptyhomes/reports/council.html:60 +#: templates/web/emptyhomes/reports/body.html:60 msgid "This is a summary of all reports for this %s." msgstr "" +#: templates/web/fixmybarangay/reports/index.html:7 +msgid "This is a summary of all reports on this site; select a particular barangay to see the reports sent there." +msgstr "" + #: templates/web/default/reports/index.html:7 templates/web/emptyhomes/reports/index.html:4 templates/web/fiksgatami/nn/reports/index.html:4 templates/web/fiksgatami/reports/index.html:4 msgid "This is a summary of all reports on this site; select a particular council to see the reports sent there." msgstr "" @@ -2299,11 +2299,11 @@ msgstr "" msgid "This problem has been closed" msgstr "" -#: templates/web/bromley/report/display.html:96 templates/web/default/report/banner.html:12 templates/web/default/report/display.html:95 templates/web/emptyhomes/report/display.html:12 templates/web/fixmystreet/report/display.html:106 +#: templates/web/bromley/report/display.html:96 templates/web/default/report/banner.html:12 templates/web/default/report/update-form.html:46 templates/web/emptyhomes/report/display.html:12 templates/web/fixmystreet/report/update-form.html:44 msgid "This problem has been fixed" msgstr "" -#: templates/web/bromley/report/display.html:90 templates/web/default/report/display.html:90 templates/web/fixmystreet/report/display.html:100 +#: templates/web/bromley/report/display.html:90 templates/web/default/report/update-form.html:41 templates/web/fixmystreet/report/update-form.html:38 msgid "This problem has not been fixed" msgstr "" @@ -2331,7 +2331,7 @@ msgstr "" msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1038 templates/web/default/admin/timeline.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1034 templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -2371,7 +2371,7 @@ msgstr "" msgid "Unknown" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:164 +#: perllib/FixMyStreet/App/Controller/Rss.pm:173 msgid "Unknown alert type" msgstr "" @@ -2379,7 +2379,7 @@ msgstr "" msgid "Unknown problem ID" msgstr "" -#: templates/web/bromley/report/display.html:66 templates/web/fixmystreet/report/display.html:81 +#: templates/web/bromley/report/display.html:66 templates/web/fixmystreet/report/update-form.html:19 msgid "Update" msgstr "" @@ -2419,11 +2419,11 @@ msgstr "" msgid "Update statuses" msgstr "" -#: templates/web/default/report/display.html:71 +#: templates/web/default/report/update-form.html:22 msgid "Update:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:708 perllib/FixMyStreet/App/Controller/Admin.pm:823 perllib/FixMyStreet/App/Controller/Admin.pm:903 +#: perllib/FixMyStreet/App/Controller/Admin.pm:708 perllib/FixMyStreet/App/Controller/Admin.pm:839 perllib/FixMyStreet/App/Controller/Admin.pm:899 msgid "Updated!" msgstr "" @@ -2439,15 +2439,15 @@ msgstr "" msgid "Updates to this problem, FixMyStreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1191 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1168 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1163 msgid "User flagged" msgstr "" -#: templates/web/default/admin/list_flagged.html:30 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 templates/web/default/admin/list_flagged.html:30 msgid "Users" msgstr "" @@ -2459,7 +2459,7 @@ msgstr "" msgid "View report on site" msgstr "" -#: templates/web/default/reports/council.html:18 +#: templates/web/default/reports/body.html:18 msgid "View reports by ward" msgstr "" @@ -2475,7 +2475,7 @@ msgstr "" msgid "Viewing a problem" msgstr "" -#: templates/web/default/reports/council.html:20 templates/web/emptyhomes/reports/council.html:18 +#: templates/web/default/reports/body.html:20 templates/web/emptyhomes/reports/body.html:18 msgid "Wards of this council" msgstr "" @@ -2491,11 +2491,11 @@ msgstr "" msgid "We may contact you periodically to ask if anything has changed with the property you reported." msgstr "" -#: templates/web/bromley/report/display.html:141 templates/web/fixmystreet/report/display.html:175 +#: templates/web/bromley/report/display.html:141 templates/web/fixmystreet/report/update-form.html:113 msgid "We never show your email" msgstr "" -#: templates/web/bromley/report/new/fill_in_details_form.html:133 templates/web/bromley/report/new/fill_in_details_form.html:179 templates/web/fixmystreet/report/new/fill_in_details_form.html:133 templates/web/fixmystreet/report/new/fill_in_details_form.html:200 +#: templates/web/bromley/report/new/fill_in_details_form.html:133 templates/web/bromley/report/new/fill_in_details_form.html:179 templates/web/fixmystreet/report/new/fill_in_details_form.html:144 templates/web/fixmystreet/report/new/fill_in_details_form.html:211 templates/web/zurich/report/new/fill_in_details_form.html:114 msgid "We never show your email address or phone number." msgstr "" @@ -2503,7 +2503,7 @@ msgstr "" msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "" -#: templates/web/default/index.html:34 templates/web/emptyhomes/index.html:59 templates/web/fixmystreet/index.html:50 +#: templates/web/default/index-steps.html:16 templates/web/emptyhomes/index.html:59 msgid "We send it to the council on your behalf" msgstr "" @@ -2531,7 +2531,7 @@ msgstr "" msgid "When sent" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:613 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:611 msgid "Whole block of empty flats" msgstr "" @@ -2539,11 +2539,11 @@ msgstr "" msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "" -#: templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/footer.html:22 templates/web/stevenage/footer.html:22 msgid "Would you like better integration with FixMyStreet? <a href=\"http://www.mysociety.org/for-councils/fixmystreet/\">Find out about FixMyStreet for councils</a>." msgstr "" -#: templates/web/fixmystreet/footer.html:18 +#: templates/web/fixmystreet/footer.html:18 templates/web/stevenage/footer.html:18 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>." msgstr "" @@ -2563,7 +2563,7 @@ msgstr "" msgid "Yes" msgstr "" -#: templates/web/bromley/report/display.html:155 templates/web/bromley/report/new/fill_in_details_form.html:198 templates/web/fixmystreet/report/display.html:149 templates/web/fixmystreet/report/new/fill_in_details_form.html:160 +#: templates/web/bromley/report/display.html:155 templates/web/bromley/report/new/fill_in_details_form.html:198 templates/web/fixmystreet/report/new/fill_in_details_form.html:171 templates/web/fixmystreet/report/update-form.html:87 msgid "Yes I have a password" msgstr "" @@ -2575,11 +2575,11 @@ msgstr "" msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/emptyhomes/reports/council.html:64 +#: templates/web/emptyhomes/reports/body.html:64 msgid "You can <a href=\"%s\">view all reports for the council</a> or <a href=\"/reports\">show all councils</a>." msgstr "" -#: templates/web/emptyhomes/reports/council.html:66 +#: templates/web/emptyhomes/reports/body.html:66 msgid "You can <a href=\"/reports\">show all councils</a>." msgstr "" @@ -2591,19 +2591,19 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" msgstr "" -#: templates/web/bromley/report/new/fill_in_details_form.html:97 templates/web/default/questionnaire/index.html:92 templates/web/default/report/new/fill_in_details_form.html:93 templates/web/fixmystreet/questionnaire/index.html:87 templates/web/fixmystreet/report/new/fill_in_details_form.html:103 +#: templates/web/bromley/report/new/fill_in_details_form.html:97 templates/web/default/questionnaire/index.html:92 templates/web/default/report/new/fill_in_details_form.html:93 templates/web/fixmystreet/questionnaire/index.html:87 templates/web/fixmystreet/report/new/fill_in_details_form.html:99 templates/web/zurich/report/new/fill_in_details_form.html:93 msgid "You have already attached a photo to this report, attaching another one will replace it." msgstr "" -#: templates/web/bromley/report/display.html:106 templates/web/default/report/display.html:106 templates/web/fixmystreet/report/display.html:116 +#: templates/web/bromley/report/display.html:106 templates/web/default/report/update-form.html:57 templates/web/fixmystreet/report/update-form.html:54 msgid "You have already attached a photo to this update, attaching another one will replace it." msgstr "" -#: templates/web/default/auth/sign_out.html:3 +#: templates/web/default/auth/sign_out.html:3 templates/web/fixmybarangay/auth/sign_out.html:3 msgid "You have been signed out" msgstr "" -#: templates/web/bromley/report/new/fill_in_details_form.html:25 templates/web/default/report/new/fill_in_details_form.html:7 templates/web/fixmystreet/report/new/fill_in_details_form.html:28 +#: templates/web/bromley/report/new/fill_in_details_form.html:25 templates/web/default/report/new/fill_in_details_form.html:7 templates/web/fixmystreet/report/new/fill_in_details_form.html:28 templates/web/zurich/report/new/fill_in_details_form.html:28 msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. " msgstr "" @@ -2627,7 +2627,7 @@ msgstr "" msgid "You have successfully deleted your alert." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:745 perllib/FixMyStreet/App/Controller/Report/Update.pm:140 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:743 perllib/FixMyStreet/App/Controller/Report/Update.pm:140 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "" @@ -2643,11 +2643,11 @@ msgstr "" msgid "Your Reports" msgstr "" -#: templates/web/bromley/report/display.html:41 templates/web/bromley/report/display.html:43 templates/web/bromley/report/new/fill_in_details_form.html:145 templates/web/fixmystreet/alert/_list.html:89 templates/web/fixmystreet/alert/updates.html:19 templates/web/fixmystreet/alert/updates.html:22 templates/web/fixmystreet/contact/index.html:72 templates/web/fixmystreet/report/display.html:49 templates/web/fixmystreet/report/display.html:51 templates/web/fixmystreet/report/new/fill_in_details_form.html:146 +#: templates/web/bromley/report/display.html:41 templates/web/bromley/report/display.html:43 templates/web/bromley/report/new/fill_in_details_form.html:145 templates/web/fixmystreet/alert/_list.html:89 templates/web/fixmystreet/alert/updates.html:19 templates/web/fixmystreet/alert/updates.html:22 templates/web/fixmystreet/contact/index.html:72 templates/web/fixmystreet/report/display.html:53 templates/web/fixmystreet/report/display.html:55 templates/web/fixmystreet/report/new/fill_in_details_form.html:115 templates/web/fixmystreet/report/new/fill_in_details_form.html:157 templates/web/zurich/report/new/fill_in_details_form.html:106 msgid "Your email" msgstr "" -#: templates/web/bromley/report/display.html:130 templates/web/fixmystreet/auth/general.html:26 templates/web/fixmystreet/report/display.html:140 +#: templates/web/bromley/report/display.html:130 templates/web/fixmystreet/auth/general.html:26 templates/web/fixmystreet/report/update-form.html:78 msgid "Your email address" msgstr "" @@ -2655,7 +2655,7 @@ msgstr "" msgid "Your email address:" msgstr "" -#: templates/web/default/alert/_list.html:92 templates/web/default/report/display.html:128 templates/web/default/report/new/fill_in_details_form.html:124 templates/web/fixmybarangay/alert/_list.html:37 +#: templates/web/default/alert/_list.html:92 templates/web/default/report/new/fill_in_details_form.html:124 templates/web/default/report/update-form.html:79 templates/web/fixmybarangay/alert/_list.html:37 msgid "Your email:" msgstr "" @@ -2671,15 +2671,15 @@ msgstr "" msgid "Your last name" msgstr "" -#: templates/web/fixmystreet/auth/general.html:57 templates/web/fixmystreet/contact/index.html:65 templates/web/fixmystreet/report/display.html:203 templates/web/fixmystreet/report/new/fill_in_details_form.html:123 templates/web/fixmystreet/report/new/fill_in_details_form.html:191 +#: templates/web/fixmystreet/auth/general.html:57 templates/web/fixmystreet/contact/index.html:65 templates/web/fixmystreet/report/new/fill_in_details_form.html:124 templates/web/fixmystreet/report/new/fill_in_details_form.html:202 templates/web/fixmystreet/report/update-form.html:138 templates/web/zurich/report/new/fill_in_details_form.html:122 msgid "Your name" msgstr "" -#: templates/web/default/auth/general.html:59 templates/web/default/contact/index.html:68 templates/web/default/report/display.html:202 templates/web/default/report/new/fill_in_details_form.html:203 +#: templates/web/default/auth/general.html:59 templates/web/default/contact/index.html:68 templates/web/default/report/new/fill_in_details_form.html:203 templates/web/default/report/update-form.html:149 msgid "Your name:" msgstr "" -#: templates/web/bromley/report/display.html:160 templates/web/bromley/report/new/fill_in_details_form.html:203 templates/web/fixmystreet/auth/general.html:41 templates/web/fixmystreet/report/display.html:154 templates/web/fixmystreet/report/new/fill_in_details_form.html:165 +#: templates/web/bromley/report/display.html:160 templates/web/bromley/report/new/fill_in_details_form.html:203 templates/web/fixmystreet/auth/general.html:41 templates/web/fixmystreet/report/new/fill_in_details_form.html:176 templates/web/fixmystreet/report/update-form.html:92 msgid "Your password" msgstr "" @@ -2687,7 +2687,7 @@ msgstr "" msgid "Your password has been changed" msgstr "" -#: templates/web/bromley/report/new/fill_in_details_form.html:137 templates/web/bromley/report/new/fill_in_details_form.html:184 templates/web/fixmystreet/report/new/fill_in_details_form.html:138 templates/web/fixmystreet/report/new/fill_in_details_form.html:205 +#: templates/web/bromley/report/new/fill_in_details_form.html:137 templates/web/bromley/report/new/fill_in_details_form.html:184 templates/web/fixmystreet/report/new/fill_in_details_form.html:149 templates/web/fixmystreet/report/new/fill_in_details_form.html:216 templates/web/zurich/report/new/fill_in_details_form.html:125 msgid "Your phone number" msgstr "" @@ -2695,7 +2695,7 @@ msgstr "" msgid "Your report" msgstr "" -#: templates/web/barnet/footer.html:18 templates/web/bromley/footer.html:19 templates/web/bromley/header.html:75 templates/web/default/footer.html:9 templates/web/fiksgatami/footer.html:6 templates/web/fiksgatami/nn/footer.html:6 templates/web/fixmystreet/footer.html:47 templates/web/reading/footer.html:7 +#: templates/web/barnet/footer.html:18 templates/web/bromley/footer.html:19 templates/web/bromley/header.html:75 templates/web/default/footer.html:9 templates/web/fiksgatami/footer.html:6 templates/web/fiksgatami/nn/footer.html:6 templates/web/fixmystreet/footer.html:47 templates/web/reading/footer.html:7 templates/web/stevenage/footer.html:41 msgid "Your reports" msgstr "" @@ -2711,11 +2711,11 @@ msgstr "" msgid "by %s" msgstr "" -#: templates/web/default/reports/council.html:12 templates/web/default/reports/council.html:13 templates/web/emptyhomes/reports/council.html:6 templates/web/emptyhomes/reports/council.html:7 +#: templates/web/default/reports/body.html:12 templates/web/default/reports/body.html:13 templates/web/emptyhomes/reports/body.html:6 templates/web/emptyhomes/reports/body.html:7 msgid "council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 +#: perllib/FixMyStreet/DB/Result/Problem.pm:608 msgid "council ref: %s" msgstr "" @@ -2723,7 +2723,7 @@ msgstr "" msgid "didn't use map" msgstr "" -#: templates/web/default/alert/index.html:33 templates/web/fixmystreet/around/postcode_form.html:23 +#: templates/web/default/alert/index.html:33 templates/web/fixmystreet/around/postcode_form.html:20 msgid "e.g. ‘%s’ or ‘%s’" msgstr "" @@ -2731,7 +2731,7 @@ msgstr "" msgid "from %d different users" msgstr "" -#: perllib/Utils.pm:295 +#: perllib/Utils.pm:267 msgid "less than a minute" msgstr "" @@ -2751,6 +2751,10 @@ msgstr "" msgid "or" msgstr "" +#: templates/web/default/js/validation_strings.html:21 +msgid "or locate me automatically" +msgstr "" + #: templates/web/default/admin/report_edit.html:15 msgid "originally entered" msgstr "" @@ -2763,15 +2767,15 @@ msgstr "" msgid "reopened" msgstr "" -#: templates/web/barnet/header.html:71 templates/web/bromley/header.html:100 templates/web/bromley/header.html:65 templates/web/fixmybarangay/header.html:67 templates/web/fixmystreet/header.html:48 templates/web/zurich/header.html:48 +#: templates/web/barnet/header.html:71 templates/web/bromley/header.html:100 templates/web/bromley/header.html:65 templates/web/fixmybarangay/header.html:65 templates/web/fixmystreet/header.html:50 templates/web/stevenage/header.html:98 templates/web/zurich/header.html:48 msgid "sign out" msgstr "" -#: templates/web/bromley/report/new/fill_in_details_form.html:4 templates/web/bromley/report/new/fill_in_details_form.html:7 templates/web/default/report/new/fill_in_details_form.html:11 templates/web/default/report/new/fill_in_details_form.html:14 templates/web/fixmystreet/report/new/fill_in_details_form.html:6 templates/web/fixmystreet/report/new/fill_in_details_form.html:9 +#: templates/web/bromley/report/new/fill_in_details_form.html:4 templates/web/bromley/report/new/fill_in_details_form.html:7 templates/web/default/report/new/fill_in_details_form.html:11 templates/web/default/report/new/fill_in_details_form.html:14 templates/web/fixmystreet/report/new/fill_in_details_form.html:6 templates/web/fixmystreet/report/new/fill_in_details_form.html:9 templates/web/zurich/report/new/fill_in_details_form.html:6 templates/web/zurich/report/new/fill_in_details_form.html:9 msgid "the local council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:549 +#: templates/web/default/report/_main.html:6 msgid "there is no pin shown as the user did not use the map" msgstr "" @@ -2779,7 +2783,7 @@ msgstr "" msgid "this type of local problem" msgstr "" -#: perllib/Utils.pm:269 +#: perllib/Utils.pm:241 msgid "today" msgstr "" @@ -2795,7 +2799,7 @@ msgstr "" msgid "user is problem owner" msgstr "" -#: templates/web/default/reports/council.html:0 templates/web/default/reports/council.html:9 templates/web/emptyhomes/reports/council.html:0 templates/web/emptyhomes/reports/council.html:3 +#: templates/web/default/reports/body.html:0 templates/web/default/reports/body.html:9 templates/web/emptyhomes/reports/body.html:0 templates/web/emptyhomes/reports/body.html:3 msgid "ward" msgstr "" @@ -2823,21 +2827,21 @@ msgstr "" msgid "your update will not be posted" msgstr "" -#: templates/web/default/front/stats.html:17 +#: templates/web/emptyhomes/front/stats.html:17 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:314 +#: perllib/Utils.pm:286 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:316 +#: perllib/Utils.pm:288 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -2851,21 +2855,21 @@ msgid_plural "<big>%s</big> updates on reports" msgstr[0] "" msgstr[1] "" -#: templates/web/default/report/new/councils_text_none.html:5 +#: templates/web/emptyhomes/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." msgid_plural "We do not yet have details for the councils that cover this location." msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:310 +#: perllib/Utils.pm:282 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "" msgstr[1] "" -#: templates/web/default/front/stats.html:12 +#: templates/web/emptyhomes/front/stats.html:12 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" @@ -2886,7 +2890,7 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:312 +#: perllib/Utils.pm:284 #, perl-format msgid "%d day" msgid_plural "%d days" diff --git a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po index be85a97c5..337bd8a40 100644 --- a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po +++ b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2012-08-21 09:54+0100\n" +"POT-Creation-Date: 2012-12-10 13:18+0000\n" "PO-Revision-Date: 2009-07-10 14:20-0000\n" "Last-Translator: Mark Smith <Mark.Smith@trosol.co.uk>\n" "Language-Team: mySociety\n" @@ -20,8 +20,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:555 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:337 +#: perllib/FixMyStreet/DB/Result/Problem.pm:560 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:339 msgid " and " msgstr "" @@ -56,97 +56,57 @@ msgstr "" msgid "%d council contacts – %d confirmed, %d unconfirmed" msgstr "" -#: perllib/Utils.pm:293 -#, fuzzy -msgid "%d day" -msgstr "diwrnod" - -#: perllib/Utils.pm:293 -#, fuzzy -msgid "%d days" -msgstr "diwrnod" - #: templates/web/default/admin/council_list.html:27 msgid "%d edits by %s" msgstr "" -#: perllib/Utils.pm:294 -#, fuzzy -msgid "%d hour" -msgstr "awr" - -#: perllib/Utils.pm:294 -#, fuzzy -msgid "%d hours" -msgstr "awr" - #: templates/web/default/admin/index.html:16 #, fuzzy msgid "%d live updates" msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" -#: perllib/Utils.pm:295 -#, fuzzy -msgid "%d minute" -msgstr "munud" - -#: perllib/Utils.pm:295 -#, fuzzy -msgid "%d minutes" -msgstr "munud" - #: templates/web/default/admin/index.html:18 msgid "%d questionnaires sent – %d answered (%s%%)" msgstr "" -#: perllib/Utils.pm:292 -#, fuzzy -msgid "%d week" -msgstr "wythnos" - -#: perllib/Utils.pm:292 -#, fuzzy -msgid "%d weeks" -msgstr "wythnos" +#: templates/web/default/report/_support.html:3 +msgid "%d supporters" +msgstr "" -#: templates/web/default/reports/council.html:0 -#: templates/web/default/reports/council.html:26 -#: templates/web/emptyhomes/reports/council.html:11 -#: templates/web/emptyhomes/reports/council.html:13 +#: templates/web/default/reports/body.html:0 +#: templates/web/default/reports/body.html:26 +#: templates/web/emptyhomes/reports/body.html:11 +#: templates/web/emptyhomes/reports/body.html:13 msgid "%s - Summary reports" msgstr "%s - Adroddiadau cryno" -#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "%s ref: %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:288 perllib/FixMyStreet/Cobrand/UK.pm:300 +#: perllib/FixMyStreet/Cobrand/UK.pm:279 perllib/FixMyStreet/Cobrand/UK.pm:291 msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:488 +#: perllib/FixMyStreet/DB/Result/Problem.pm:496 msgid "%s, reported anonymously at %s" msgstr "Rhoddodd %s wybod yn ddi-enw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:490 +#: perllib/FixMyStreet/DB/Result/Problem.pm:498 msgid "%s, reported by %s at %s" msgstr "Adroddwyd am %s gan %s am %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:315 perllib/FixMyStreet/Cobrand/UK.pm:327 +#: perllib/FixMyStreet/Cobrand/UK.pm:306 perllib/FixMyStreet/Cobrand/UK.pm:318 #, fuzzy msgid "%s, within %s ward" msgstr "Eiddo gwag yn ward %s" -#: templates/web/default/admin/stats.html:5 -#, fuzzy -msgid "%sreports between %s and %s" -msgstr "Adroddwyd am %s gan %s am %s" - #: templates/web/default/email_sent.html:28 msgid "(Don't worry — %s)" msgstr "" #: templates/web/default/admin/report_blocks.html:11 +#: templates/web/default/admin/search_users.html:23 msgid "(Email in abuse table)" msgstr "" @@ -173,7 +133,7 @@ msgid "(returned to use)" msgstr "(wedi'i adfer i'w ddefnyddio)" #: templates/web/default/index.html:12 templates/web/default/index.html:8 -#: templates/web/fixmystreet/around/postcode_form.html:7 +#: templates/web/fixmystreet/around/intro.html:2 msgid " " msgstr " " @@ -184,6 +144,7 @@ msgid "(not sent to council)" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" #: templates/web/default/report/new/fill_in_details_form.html:217 +#: templates/web/zurich/report/new/fill_in_details_form.html:118 msgid "(optional)" msgstr "(dewisol)" @@ -197,24 +158,24 @@ msgstr "Ni roddwyd gwybod i'r cyngor am hyn" msgid "(we never show your email address or phone number)" msgstr "(nid ydym byth yn dangos eich cyfeiriad e-bost na'ch rhif ffôn)" -#: templates/web/default/report/display.html:209 +#: templates/web/default/report/update-form.html:156 #, fuzzy msgid "(we never show your email)" msgstr "(nid ydym byth yn dangos eich cyfeiriad e-bost na'ch rhif ffôn)" -#: perllib/FixMyStreet/App/Controller/Admin.pm:284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:285 msgid "*unknown*" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:629 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:655 -#: perllib/FixMyStreet/DB/Result/Problem.pm:345 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:628 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:656 +#: perllib/FixMyStreet/DB/Result/Problem.pm:353 #, fuzzy msgid "-- Pick a category --" msgstr "-- Dewiswch fath o eiddo --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:609 -#: perllib/FixMyStreet/DB/Result/Problem.pm:351 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:359 msgid "-- Pick a property type --" msgstr "-- Dewiswch fath o eiddo --" @@ -224,6 +185,10 @@ msgstr "-- Dewiswch fath o eiddo --" msgid ". You can <a href=\"%s%s\">view the empty property on this site</a>." msgstr ". Gallwch <a href=\"%s\">weld yr eiddo gwag ar y safle hwn</a>." +#: templates/web/default/report/_support.html:3 +msgid "1 supporter" +msgstr "" + #: templates/web/default/questionnaire/completed.html:20 #, fuzzy msgid "" @@ -255,7 +220,7 @@ msgstr "" "chyhoeddi</a>?\n" "</p>\n" -#: templates/web/fixmystreet/questionnaire/completed-open.html:1 +#: templates/web/fixmystreet/questionnaire/completed-open.html:6 #, fuzzy msgid "" "<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" @@ -277,7 +242,7 @@ msgstr "" "chyhoeddi</a>?\n" "</p>\n" -#: templates/web/default/questionnaire/completed-open.html:1 +#: templates/web/default/questionnaire/completed-open.html:6 #, fuzzy msgid "" "<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" @@ -376,8 +341,8 @@ msgstr "" "mwy o wybodaeth am statws eich eiddo gwag, dewch yn ôl i'r safle\n" "a rhowch ddiweddariad yno.</p>\n" -#: templates/web/default/around/display_location.html:70 -#: templates/web/default/around/display_location.html:72 +#: templates/web/default/around/_report_banner.html:3 +#: templates/web/default/around/_report_banner.html:5 #: templates/web/emptyhomes/around/display_location.html:36 #: templates/web/emptyhomes/around/display_location.html:38 #, fuzzy @@ -393,17 +358,17 @@ msgstr "" msgid "<strong>%d</strong> live empty properties" msgstr "Adrodd am eiddo gwag a gweld y rhain" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:172 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:193 #, fuzzy msgid "<strong>No</strong> Let me confirm my report by email" msgstr "Adrodd am eiddo gwag a gweld y rhain" -#: templates/web/fixmystreet/report/display.html:148 +#: templates/web/fixmystreet/report/update-form.html:108 #, fuzzy msgid "<strong>No</strong> Let me confirm my update by email" msgstr "Adrodd am eiddo gwag a gweld y rhain" -#: templates/web/fixmystreet/auth/general.html:46 +#: templates/web/fixmystreet/auth/general.html:50 #, fuzzy msgid "<strong>No</strong> let me sign in by email" msgstr "Adrodd am eiddo gwag a gweld y rhain" @@ -417,18 +382,18 @@ msgstr "" msgid "<strong>No</strong>, let me confirm my report by email:" msgstr "Adrodd am eiddo gwag a gweld y rhain" -#: templates/web/default/report/display.html:164 +#: templates/web/default/report/update-form.html:115 #, fuzzy msgid "<strong>No</strong>, let me confirm my update by email:" msgstr "Adrodd am eiddo gwag a gweld y rhain" #: templates/web/default/auth/general.html:37 -#: templates/web/default/report/display.html:142 #: templates/web/default/report/new/fill_in_details_form.html:140 -#: templates/web/fixmystreet/auth/general.html:32 -#: templates/web/fixmystreet/auth/general.html:34 -#: templates/web/fixmystreet/report/display.html:131 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:154 +#: templates/web/default/report/update-form.html:93 +#: templates/web/fixmystreet/auth/general.html:36 +#: templates/web/fixmystreet/auth/general.html:38 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:169 +#: templates/web/fixmystreet/report/update-form.html:85 #, fuzzy msgid "<strong>Yes</strong> I have a password" msgstr "Adrodd am eiddo gwag a gweld y rhain" @@ -441,11 +406,11 @@ msgstr "Adrodd am eiddo gwag a gweld y rhain" msgid "About us" msgstr "Amdanom ni" -#: templates/web/default/admin/council_contacts.html:66 +#: templates/web/default/admin/council_contacts.html:72 msgid "Add new category" msgstr "" -#: templates/web/default/my/my.html:56 templates/web/fixmystreet/my/my.html:56 +#: templates/web/default/my/my.html:56 templates/web/fixmystreet/my/my.html:60 msgid "Added %s" msgstr "" @@ -462,16 +427,13 @@ msgid "Alert %d disabled (created %s)" msgstr "" #: templates/web/bromley/report/display.html:207 -#: templates/web/default/report/display.html:214 -#: templates/web/fixmystreet/report/display.html:189 +#: templates/web/default/report/update-form.html:161 +#: templates/web/fixmystreet/report/update-form.html:146 msgid "Alert me to future updates" msgstr "Rhowch wybod i mi am ddiweddariadau yn y dyfodol" -#: templates/web/default/admin/stats.html:5 -msgid "All" -msgstr "" - #: templates/web/default/reports/index.html:3 +#: templates/web/fixmybarangay/reports/index.html:3 #, fuzzy msgid "All Reports" msgstr "Adroddiadau" @@ -484,11 +446,19 @@ msgstr "" #: templates/web/bromley/header.html:77 templates/web/default/footer.html:11 #: templates/web/fiksgatami/footer.html:7 #: templates/web/fiksgatami/nn/footer.html:7 +#: templates/web/fixmybarangay/footer.html:20 #: templates/web/fixmystreet/footer.html:49 -#: templates/web/reading/footer.html:8 -msgid "Reports" +#: templates/web/reading/footer.html:8 templates/web/stevenage/footer.html:43 +#: templates/web/zurich/footer.html:12 +#, fuzzy +msgid "All reports" msgstr "Adroddiadau" +#: templates/web/default/admin/stats.html:5 +#, fuzzy +msgid "All reports between %s and %s" +msgstr "Adroddwyd am %s gan %s am %s" + #: templates/web/default/report/new/councils_text_some.html:2 msgid "All the information you provide here will be sent to" msgstr "" @@ -526,6 +496,8 @@ msgstr "" #: templates/web/default/report/new/fill_in_details_form.html:13 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:6 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:8 +#: templates/web/zurich/report/new/fill_in_details_form.html:6 +#: templates/web/zurich/report/new/fill_in_details_form.html:8 msgid "" "All the information you provide here will be sent to <strong>%s</strong>." msgstr "" @@ -569,10 +541,12 @@ msgid "" msgstr "" #: templates/web/fixmystreet/footer.html:17 +#: templates/web/stevenage/footer.html:17 msgid "Are you a developer?" msgstr "" #: templates/web/fixmystreet/footer.html:21 +#: templates/web/stevenage/footer.html:21 #, fuzzy msgid "Are you from a council?" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" @@ -593,6 +567,16 @@ msgstr "" msgid "Ban email address" msgstr "Eich cyfeiriad e-bost:" +#: templates/web/fixmybarangay/report/new/notes.html:7 +msgid "" +"Be sure to choose the right category, because we use that to determine to " +"whom the report is sent." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1032 +msgid "Bodies" +msgstr "" + #: templates/web/fiksgatami/footer.html:16 #: templates/web/fiksgatami/nn/footer.html:16 msgid "" @@ -604,22 +588,23 @@ msgstr "" msgid "By Date" msgstr "" -#: templates/web/fixmystreet/around/display_location.html:80 -#: templates/web/fixmystreet/around/display_location.html:82 +#: templates/web/fixmystreet/around/_report_banner.html:10 +#: templates/web/fixmystreet/around/_report_banner.html:8 #, fuzzy msgid "Can't see the map? <a href='%s' rel='nofollow'>Skip this step</a>" msgstr "" "<small>Os na allwch weld y map, <a href='%s' rel='nofollow'>ewch heibio\n" " i'r cam hwn</a>.</small>" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:657 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:631 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: templates/web/bromley/report/new/fill_in_details_form.html:68 -#: templates/web/default/admin/council_contacts.html:35 +#: templates/web/default/admin/council_contacts.html:37 #: templates/web/default/admin/index.html:36 #: templates/web/default/admin/list_flagged.html:14 #: templates/web/default/admin/search_reports.html:17 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:72 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:74 +#: templates/web/zurich/report/new/fill_in_details_form.html:68 #, fuzzy msgid "Category" msgstr "Categori:" @@ -628,14 +613,14 @@ msgstr "Categori:" msgid "Category fix rate for empty properties > 4 weeks old" msgstr "" -#: templates/web/default/admin/council_contacts.html:72 +#: templates/web/default/admin/council_contacts.html:78 #: templates/web/default/admin/council_edit.html:23 #: templates/web/default/admin/report_edit.html:25 #: templates/web/default/report/new/fill_in_details_form.html:67 msgid "Category:" msgstr "Categori:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:334 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:336 #, fuzzy msgid "Category: %s" msgstr "Categori:" @@ -646,8 +631,8 @@ msgstr "Categori:" msgid "Change Password" msgstr "" -#: templates/web/fixmystreet/around/display_location.html:72 -#: templates/web/fixmystreet/around/display_location.html:73 +#: templates/web/default/js/validation_strings.html:22 +#: templates/web/fixmystreet/around/_report_banner.html:2 #, fuzzy msgid "Click map to report an empty property" msgstr "Sut i roi gwybod am eiddo gwag" @@ -656,22 +641,22 @@ msgstr "Sut i roi gwybod am eiddo gwag" #: templates/web/bromley/report/display.html:82 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:20 -#: templates/web/default/dashboard/index.html:136 #: templates/web/default/dashboard/index.html:138 -#: templates/web/default/report/display.html:79 -#: templates/web/default/report/display.html:81 +#: templates/web/default/dashboard/index.html:140 +#: templates/web/default/report/update-form.html:30 +#: templates/web/default/report/update-form.html:32 #: templates/web/fixmystreet/report/banner.html:15 -#: templates/web/fixmystreet/report/display.html:74 -#: templates/web/fixmystreet/report/display.html:76 +#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/fixmystreet/report/update-form.html:30 msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:690 +#: perllib/FixMyStreet/DB/Result/Problem.pm:695 #, fuzzy msgid "Closed by council" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" -#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:32 +#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:36 #, fuzzy msgid "Closed reports" msgstr "Cuddio hen adroddiadau " @@ -680,8 +665,8 @@ msgstr "Cuddio hen adroddiadau " msgid "Closed:" msgstr "" -#: templates/web/default/around/display_location.html:103 -#: templates/web/default/around/display_location.html:105 +#: templates/web/default/around/tabbed_lists.html:10 +#: templates/web/default/around/tabbed_lists.html:12 msgid "Closest nearby empty properties <small>(within %skm)</small>" msgstr "Yr eiddo gwag cyfagos agosaf <small>(within %skm)</small>" @@ -705,24 +690,29 @@ msgstr "" msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:358 +#: perllib/FixMyStreet/App/Controller/Admin.pm:365 #, fuzzy msgid "Configuration updated" msgstr "Cadarnhau" -#: perllib/FixMyStreet/App/Controller/Admin.pm:372 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 msgid "Configuration updated - contacts will be generated automatically later" msgstr "" -#: templates/web/default/admin/council_contacts.html:153 +#: templates/web/default/admin/council_edit.html:34 +#, fuzzy +msgid "Configure Endpoint" +msgstr "Cadarnhau" + +#: templates/web/default/admin/council_contacts.html:168 msgid "Configure Open311" msgstr "" -#: templates/web/default/admin/council_contacts.html:105 +#: templates/web/default/admin/council_contacts.html:116 msgid "Configure Open311 integration" msgstr "" -#: templates/web/default/admin/council_contacts.html:42 +#: templates/web/default/admin/council_contacts.html:46 #, fuzzy msgid "Confirm" msgstr "Cadarnhau" @@ -732,6 +722,13 @@ msgstr "Cadarnhau" msgid "Confirm account" msgstr "Cadarnhau" +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:187 +#: templates/web/fixmystreet/report/update-form.html:103 +msgid "" +"Confirm by email below, providing a new password at that point. When you " +"confirm, your password will be updated." +msgstr "" + #: templates/web/default/questionnaire/creator_fixed.html:1 #: templates/web/default/tokens/confirm_problem.html:1 #: templates/web/default/tokens/confirm_problem.html:3 @@ -739,18 +736,24 @@ msgstr "Cadarnhau" #: templates/web/default/tokens/confirm_update.html:3 #: templates/web/emptyhomes/tokens/confirm_problem.html:1 #: templates/web/emptyhomes/tokens/confirm_problem.html:3 +#: templates/web/southampton/tokens/confirm_problem.html:1 +#: templates/web/southampton/tokens/confirm_problem.html:3 msgid "Confirmation" msgstr "Cadarnhau" -#: templates/web/default/admin/council_contacts.html:37 -#: templates/web/default/admin/council_contacts.html:82 +#: templates/web/default/admin/council_contacts.html:39 +#: templates/web/default/admin/council_contacts.html:88 #: templates/web/default/admin/council_edit.html:28 -#: templates/web/default/admin/council_edit.html:43 -#: templates/web/default/admin/stats.html:5 +#: templates/web/default/admin/council_edit.html:71 #, fuzzy msgid "Confirmed" msgstr "Cadarnhau" +#: templates/web/default/admin/stats.html:5 +#, fuzzy +msgid "Confirmed reports between %s and %s" +msgstr "Adroddwyd am %s gan %s am %s" + #: templates/web/default/admin/problem_row.html:23 #: templates/web/default/admin/report_edit.html:34 #, fuzzy @@ -783,8 +786,8 @@ msgstr "Cysylltwch â Ni" msgid "Contact the team" msgstr "Cysylltu â'r tîm" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1150 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1178 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1159 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1187 msgid "Could not find user" msgstr "" @@ -796,7 +799,6 @@ msgstr "" msgid "Council" msgstr "cyngor" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1022 #: templates/web/default/admin/council_list.html:1 #, fuzzy msgid "Council contacts" @@ -829,7 +831,7 @@ msgstr "Cysylltu" msgid "Create a report" msgstr "Categori:" -#: templates/web/default/admin/council_contacts.html:96 +#: templates/web/default/admin/council_contacts.html:107 #, fuzzy msgid "Create category" msgstr "Categori:" @@ -858,15 +860,16 @@ msgstr "" msgid "Dashboard" msgstr "" -#: templates/web/default/admin/council_contacts.html:38 -#: templates/web/default/admin/council_contacts.html:85 +#: templates/web/default/admin/council_contacts.html:40 +#: templates/web/default/admin/council_contacts.html:91 #: templates/web/default/admin/council_edit.html:29 -#: templates/web/default/admin/council_edit.html:44 +#: templates/web/default/admin/council_edit.html:72 msgid "Deleted" msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:54 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:64 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 +#: templates/web/zurich/report/new/fill_in_details_form.html:60 #, fuzzy msgid "Details" msgstr "Manylion:" @@ -876,14 +879,23 @@ msgstr "Manylion:" msgid "Details:" msgstr "Manylion:" +#: templates/web/default/admin/council_contacts.html:41 +msgid "Devolved" +msgstr "" + #: templates/web/default/admin/council_list.html:23 msgid "Diligency prize league table" msgstr "" +#: templates/web/fixmystreet/auth/general.html:30 +#, fuzzy +msgid "Do you have a FixMyBarangay password?" +msgstr "Diweddariadau i reportemptyhomes.com" + #: templates/web/default/auth/general.html:32 -#: templates/web/fixmystreet/auth/general.html:29 -#: templates/web/fixmystreet/report/display.html:128 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:150 +#: templates/web/fixmystreet/auth/general.html:32 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:165 +#: templates/web/fixmystreet/report/update-form.html:82 #, fuzzy msgid "Do you have a reportemptyhomes.com password?" msgstr "Diweddariadau i reportemptyhomes.com" @@ -914,34 +926,33 @@ msgstr "Cyflwyno'ch diweddariad" msgid "Editing user %d" msgstr "Cyflwyno'ch diweddariad" -#: templates/web/default/admin/council_edit.html:45 +#: templates/web/default/admin/council_edit.html:73 msgid "Editor" msgstr "" #: templates/web/bromley/report/display.html:126 -#: templates/web/default/admin/council_contacts.html:36 -#: templates/web/default/admin/council_edit.html:42 +#: templates/web/default/admin/council_contacts.html:38 +#: templates/web/default/admin/council_edit.html:70 #: templates/web/default/admin/list_flagged.html:12 #: templates/web/default/admin/list_flagged.html:35 #: templates/web/default/admin/list_updates.html:8 -#: templates/web/default/admin/search_abuse.html:11 #: templates/web/default/admin/search_reports.html:15 #: templates/web/default/admin/search_users.html:13 #: templates/web/fixmystreet/auth/general.html:20 -#: templates/web/fixmystreet/report/display.html:120 +#: templates/web/fixmystreet/report/update-form.html:74 #, fuzzy msgid "Email" msgstr "E-bost:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1126 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1135 msgid "Email added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1123 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1132 msgid "Email already in abuse list" msgstr "" -#: templates/web/default/around/display_location.html:85 +#: templates/web/default/around/_updates.html:5 msgid "Email me new local empty properties" msgstr "Anfonwch fanylion eiddo gwag lleol newydd ataf i drwy'r e-bost" @@ -949,7 +960,7 @@ msgstr "Anfonwch fanylion eiddo gwag lleol newydd ataf i drwy'r e-bost" msgid "Email me updates" msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" -#: templates/web/default/admin/council_contacts.html:77 +#: templates/web/default/admin/council_contacts.html:83 #: templates/web/default/admin/council_edit.html:26 #: templates/web/default/admin/report_edit.html:31 #: templates/web/default/admin/update_edit.html:24 @@ -959,15 +970,15 @@ msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" msgid "Email:" msgstr "E-bost:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:611 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:610 msgid "Empty flat or maisonette" msgstr "Fflat neu fflat deulawr gwag" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:610 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:609 msgid "Empty house or bungalow" msgstr "Tŷ neu fyngalo gwag" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:613 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:612 msgid "Empty office or other commercial" msgstr "Swyddfa wag neu fan masnachol gwag arall" @@ -975,11 +986,11 @@ msgstr "Swyddfa wag neu fan masnachol gwag arall" msgid "Empty property details form" msgstr "Ffurflen manylion eiddo gwag" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:614 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:613 msgid "Empty pub or bar" msgstr "Tafarn neu far gwag" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:615 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:614 msgid "Empty public building - school, hospital, etc." msgstr "Adeilad cyhoeddus gwag - ysgol, ysbyty, ac ati." @@ -996,6 +1007,11 @@ msgstr "diwrnod" msgid "End month:" msgstr "" +#: perllib/FixMyStreet/Cobrand/Zurich.pm:9 +#, fuzzy +msgid "Enter a Zürich street name" +msgstr "Cofnodwch god post Prydeinig, neu enw stryd ac ardal gerllaw:" + #: templates/web/emptyhomes/index.html:40 #: templates/web/emptyhomes/index.html:41 msgid "Enter a nearby GB postcode, or street name and area" @@ -1020,23 +1036,23 @@ msgid "Enter a nearby street name and area" msgstr "Cofnodwch god post Prydeinig, neu enw stryd ac ardal gerllaw:" #: templates/web/default/auth/general.html:64 -#: templates/web/default/report/display.html:171 #: templates/web/default/report/new/fill_in_details_form.html:169 +#: templates/web/default/report/update-form.html:122 #, fuzzy msgid "Enter a new password:" msgstr "Ychwanegwch neges" #: templates/web/bromley/report/display.html:148 #: templates/web/bromley/report/new/fill_in_details_form.html:189 -#: templates/web/fixmystreet/auth/general.html:57 -#: templates/web/fixmystreet/report/display.html:160 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:200 +#: templates/web/fixmystreet/auth/general.html:61 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:221 +#: templates/web/fixmystreet/report/update-form.html:120 #, fuzzy msgid "Enter a password" msgstr "Ychwanegwch neges" -#: templates/web/default/index.html:33 templates/web/emptyhomes/index.html:58 -#: templates/web/fixmystreet/index.html:41 +#: templates/web/default/index-steps.html:11 +#: templates/web/emptyhomes/index.html:58 msgid "Enter details of the empty property" msgstr "Rhowch fanylion yr eiddo gwag" @@ -1050,7 +1066,7 @@ msgstr "Rhowch fanylion yr eiddo gwag" msgid "Error" msgstr "Gwall" -#: templates/web/default/admin/council_contacts.html:11 +#: templates/web/default/admin/council_contacts.html:13 #: templates/web/default/admin/council_edit.html:18 msgid "Example postcode %s" msgstr "" @@ -1095,16 +1111,11 @@ msgstr "Trwsio<span id=\"my\">Fy</span>Stryd" msgid "reportemptyhomes.com" msgstr "reportemptyhomes.com" -#: templates/web/default/admin/header.html:13 +#: templates/web/default/admin/header.html:10 #, fuzzy msgid "reportemptyhomes.com admin:" msgstr "reportemptyhomes.com" -#: templates/web/default/admin/header.html:3 -#, fuzzy -msgid "reportemptyhomes.com administration" -msgstr "Diweddariadau i reportemptyhomes.com" - #: templates/web/default/alert/index.html:11 msgid "" "reportemptyhomes.com has a variety of RSS feeds and email alerts for local " @@ -1148,13 +1159,13 @@ msgstr "" #: templates/web/default/admin/index.html:36 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:20 -#: templates/web/default/dashboard/index.html:136 #: templates/web/default/dashboard/index.html:138 -#: templates/web/default/report/display.html:79 -#: templates/web/default/report/display.html:81 +#: templates/web/default/dashboard/index.html:140 +#: templates/web/default/report/update-form.html:30 +#: templates/web/default/report/update-form.html:32 #: templates/web/fixmystreet/report/banner.html:12 -#: templates/web/fixmystreet/report/display.html:74 -#: templates/web/fixmystreet/report/display.html:76 +#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/fixmystreet/report/update-form.html:30 msgid "Fixed" msgstr "" @@ -1170,7 +1181,7 @@ msgstr "cyngor" msgid "Fixed - User" msgstr "Cuddio hen adroddiadau " -#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:27 +#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:31 #, fuzzy msgid "Fixed reports" msgstr "Cuddio hen adroddiadau " @@ -1183,6 +1194,7 @@ msgstr "" msgid "Flag user" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1037 #: templates/web/default/admin/search_users.html:15 msgid "Flagged" msgstr "" @@ -1193,7 +1205,7 @@ msgid "Flagged:" msgstr "" #: templates/web/default/reports/_ward-list.html:3 -#: templates/web/emptyhomes/reports/council.html:19 +#: templates/web/emptyhomes/reports/body.html:19 #: templates/web/fixmystreet/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "" @@ -1203,11 +1215,18 @@ msgstr "" msgid "For council(s):" msgstr "cyngor" +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:186 +#: templates/web/fixmystreet/report/update-form.html:102 +#, fuzzy +msgid "Forgotten your password?" +msgstr "Adroddiadau" + #: templates/web/default/faq/faq-en-gb.html:1 #: templates/web/emptyhomes/faq/faq-cy.html:1 #: templates/web/emptyhomes/faq/faq-en-gb.html:1 #: templates/web/fiksgatami/faq/faq-nb.html:1 #: templates/web/fiksgatami/nn/faq/faq-nn.html:1 +#: templates/web/fixmybarangay/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/static/privacy.html:1 #: templates/web/zurich/faq/faq-de.html:1 @@ -1223,7 +1242,7 @@ msgid "GeoRSS on Google Maps" msgstr "" #: templates/web/bromley/report/display.html:30 -#: templates/web/fixmystreet/report/display.html:23 +#: templates/web/fixmystreet/report/display.html:31 #, fuzzy msgid "Get updates" msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" @@ -1241,6 +1260,7 @@ msgid "Get updates of empty properties in this %s" msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn" #: templates/web/default/alert/_list.html:83 +#: templates/web/fixmybarangay/alert/_list.html:28 #: templates/web/fixmystreet/alert/_list.html:82 msgid "Give me an RSS feed" msgstr "Rhowch borthiant RSS i mi" @@ -1248,7 +1268,7 @@ msgstr "Rhowch borthiant RSS i mi" #: templates/web/default/alert/index.html:34 #: templates/web/default/around/postcode_form.html:8 #: templates/web/emptyhomes/index.html:47 -#: templates/web/fixmystreet/around/postcode_form.html:18 +#: templates/web/fixmystreet/around/postcode_form.html:21 msgid "Go" msgstr "Ewch" @@ -1285,8 +1305,10 @@ msgstr "" #: templates/web/emptyhomes/header.html:28 #: templates/web/fiksgatami/footer.html:9 #: templates/web/fiksgatami/nn/footer.html:9 +#: templates/web/fixmybarangay/footer.html:24 #: templates/web/fixmystreet/footer.html:53 -#: templates/web/reading/footer.html:10 +#: templates/web/reading/footer.html:10 templates/web/stevenage/footer.html:47 +#: templates/web/zurich/footer.html:14 msgid "FAQs" msgstr "Cwestiynau Cyffredin" @@ -1298,9 +1320,9 @@ msgstr "" #: templates/web/barnet/header.html:70 templates/web/bromley/header.html:64 #: templates/web/bromley/header.html:99 -#: templates/web/fixmybarangay/header.html.orig:42 -#: templates/web/fixmystreet/header.html:47 -#: templates/web/zurich/header.html:47 +#: templates/web/fixmybarangay/header.html:64 +#: templates/web/fixmystreet/header.html:49 +#: templates/web/stevenage/header.html:97 templates/web/zurich/header.html:47 msgid "Hi %s" msgstr "" @@ -1311,26 +1333,24 @@ msgstr "" msgid "Hidden" msgstr "Cuddio pinnau" -#: templates/web/default/around/display_location.html:58 -#: templates/web/fixmystreet/around/display_location.html:58 +#: templates/web/default/around/display_location.html:63 msgid "Hide old" msgstr "" -#: templates/web/default/around/display_location.html:53 -#: templates/web/fixmystreet/around/display_location.html:54 +#: templates/web/default/around/display_location.html:58 msgid "Hide pins" msgstr "Cuddio pinnau" -#: templates/web/default/admin/council_edit.html:38 +#: templates/web/default/admin/council_edit.html:66 msgid "History" msgstr "" -#: templates/web/default/index.html:28 templates/web/emptyhomes/index.html:53 -#: templates/web/fixmystreet/index.html:36 +#: templates/web/default/index-steps.html:1 +#: templates/web/emptyhomes/index.html:53 msgid "How to report an empty property" msgstr "Sut i roi gwybod am eiddo gwag" -#: perllib/FixMyStreet/App/Controller/Admin.pm:637 +#: perllib/FixMyStreet/App/Controller/Admin.pm:648 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "" @@ -1418,12 +1438,12 @@ msgstr "Dewis porthiant annilys" #: templates/web/bromley/report/display.html:82 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:20 -#: templates/web/default/dashboard/index.html:136 #: templates/web/default/dashboard/index.html:138 -#: templates/web/default/report/display.html:79 -#: templates/web/default/report/display.html:81 -#: templates/web/fixmystreet/report/display.html:74 -#: templates/web/fixmystreet/report/display.html:76 +#: templates/web/default/dashboard/index.html:140 +#: templates/web/default/report/update-form.html:30 +#: templates/web/default/report/update-form.html:32 +#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/fixmystreet/report/update-form.html:30 msgid "In Progress" msgstr "" @@ -1452,7 +1472,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:952 #, fuzzy msgid "Invalid end date" msgstr "Rhowch ddiweddariad" @@ -1461,7 +1481,7 @@ msgstr "Rhowch ddiweddariad" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:932 +#: perllib/FixMyStreet/App/Controller/Admin.pm:942 msgid "Invalid start date" msgstr "" @@ -1469,12 +1489,12 @@ msgstr "" #: templates/web/bromley/report/display.html:81 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/dashboard/index.html:136 -#: templates/web/default/dashboard/index.html:137 -#: templates/web/default/report/display.html:79 -#: templates/web/default/report/display.html:80 -#: templates/web/fixmystreet/report/display.html:74 -#: templates/web/fixmystreet/report/display.html:75 +#: templates/web/default/dashboard/index.html:138 +#: templates/web/default/dashboard/index.html:139 +#: templates/web/default/report/update-form.html:30 +#: templates/web/default/report/update-form.html:31 +#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/fixmystreet/report/update-form.html:29 #, fuzzy msgid "Investigating" msgstr "Mordwyo " @@ -1506,11 +1526,11 @@ msgstr "" #: templates/web/bromley/report/display.html:166 #: templates/web/bromley/report/new/fill_in_details_form.html:209 #: templates/web/default/auth/general.html:44 -#: templates/web/default/report/display.html:151 #: templates/web/default/report/new/fill_in_details_form.html:149 -#: templates/web/fixmystreet/auth/general.html:42 -#: templates/web/fixmystreet/report/display.html:144 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:167 +#: templates/web/default/report/update-form.html:102 +#: templates/web/fixmystreet/auth/general.html:46 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:182 +#: templates/web/fixmystreet/report/update-form.html:98 msgid "Keep me signed in on this computer" msgstr "" @@ -1521,7 +1541,7 @@ msgstr "" msgid "Last Name" msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" -#: templates/web/default/admin/council_contacts.html:39 +#: templates/web/default/admin/council_contacts.html:42 msgid "Last editor" msgstr "" @@ -1534,19 +1554,16 @@ msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" msgid "Last update:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1028 -msgid "List Flagged" -msgstr "" - -#: templates/web/default/admin/council_contacts.html:14 #: templates/web/default/admin/council_contacts.html:16 +#: templates/web/default/admin/council_contacts.html:18 #, fuzzy msgid "List all reported empty properties" msgstr "Eiddo gwag yr adroddwyd amdanynt yn ddiweddar" #: templates/web/bromley/report/new/fill_in_details_form.html:69 #: templates/web/default/report/new/fill_in_details_form.html:68 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:75 +#: templates/web/zurich/report/new/fill_in_details_form.html:69 msgid "Loading..." msgstr "" @@ -1561,6 +1578,8 @@ msgstr "" #: templates/web/default/tokens/confirm_alert.html:3 #: templates/web/emptyhomes/alert/index.html:1 #: templates/web/emptyhomes/alert/index.html:3 +#: templates/web/fixmybarangay/alert/index.html:1 +#: templates/web/fixmybarangay/alert/index.html:3 #: templates/web/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "Porthiannau RSS a hysbysiadau e-bost lleol" @@ -1577,13 +1596,14 @@ msgstr "Porthiannau RSS a hysbysiadau e-bost lleol" #: templates/web/bromley/header.html:79 templates/web/default/footer.html:13 #: templates/web/fiksgatami/footer.html:8 #: templates/web/fiksgatami/nn/footer.html:8 +#: templates/web/fixmybarangay/footer.html:22 #: templates/web/fixmystreet/footer.html:51 -#: templates/web/reading/footer.html:9 +#: templates/web/reading/footer.html:9 templates/web/stevenage/footer.html:45 msgid "Get local reports" msgstr "Gweld adroddiadau lleol" -#: templates/web/default/index.html:32 templates/web/emptyhomes/index.html:57 -#: templates/web/fixmystreet/index.html:40 +#: templates/web/default/index-steps.html:10 +#: templates/web/emptyhomes/index.html:57 msgid "Locate the empty property on a map of the area" msgstr "Chwiliwch am leoliad yr eiddo gwag ar fap o'r ardal" @@ -1625,10 +1645,12 @@ msgstr "Mwy o eiddo gwag cyfagos" #: templates/web/emptyhomes/reports/index.html:10 #: templates/web/fiksgatami/nn/reports/index.html:9 #: templates/web/fiksgatami/reports/index.html:9 -#: templates/web/fixmystreet/auth/general.html:52 -#: templates/web/fixmystreet/report/display.html:177 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:117 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:176 +#: templates/web/fixmybarangay/reports/index.html:19 +#: templates/web/fixmystreet/auth/general.html:56 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:120 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:197 +#: templates/web/fixmystreet/report/update-form.html:134 +#: templates/web/zurich/report/new/fill_in_details_form.html:118 msgid "Name" msgstr "Enw" @@ -1644,26 +1666,26 @@ msgstr "Enw:" msgid "Navigation" msgstr "Mordwyo " -#: perllib/FixMyStreet/Geocode/OSM.pm:159 +#: perllib/FixMyStreet/Geocode/OSM.pm:166 msgid "" "Nearest named road to the pin placed on the map (automatically generated " "using OpenStreetMap): %s%s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:161 +#: perllib/FixMyStreet/Cobrand/UK.pm:152 msgid "" "Nearest postcode to the pin placed on the map (automatically generated): %s " "(%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:404 -#: perllib/FixMyStreet/Cobrand/Default.pm:444 +#: perllib/FixMyStreet/Cobrand/Default.pm:407 +#: perllib/FixMyStreet/Cobrand/Default.pm:447 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing " "Maps): %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:245 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:265 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing " "Maps): %s\n" @@ -1675,11 +1697,12 @@ msgid "Nearly Done! Now check your email..." msgstr "" #: templates/web/default/reports/index.html:16 +#: templates/web/fixmybarangay/reports/index.html:20 #, fuzzy msgid "New <br>empty properties" msgstr "Adroddiadau newydd am eiddo gwag" -#: perllib/FixMyStreet/App/Controller/Admin.pm:314 +#: perllib/FixMyStreet/App/Controller/Admin.pm:320 msgid "New category contact added" msgstr "" @@ -1762,8 +1785,9 @@ msgstr "" msgid "New!" msgstr "Newydd!" -#: templates/web/default/admin/council_contacts.html:48 -#: templates/web/default/admin/council_contacts.html:49 +#: templates/web/default/admin/council_contacts.html:52 +#: templates/web/default/admin/council_contacts.html:53 +#: templates/web/default/admin/council_contacts.html:54 #: templates/web/default/admin/council_edit.html:4 #: templates/web/default/admin/list_updates.html:30 #: templates/web/default/admin/list_updates.html:31 @@ -1786,7 +1810,7 @@ msgstr "Nac ydw" msgid "No council" msgstr "cyngor" -#: perllib/FixMyStreet/DB/Result/Problem.pm:328 +#: perllib/FixMyStreet/DB/Result/Problem.pm:336 msgid "No council selected" msgstr "Ni ddewiswyd cyngor" @@ -1817,6 +1841,14 @@ msgstr "Ni ddaethpwyd o hyd i unrhyw eiddo gwag." msgid "No empty properties have been reported yet." msgstr "Ni roddwyd gwybod eto am unrhyw eiddo gwag." +#: templates/web/default/report/_support.html:3 +msgid "No supporters" +msgstr "" + +#: templates/web/default/admin/council_contacts.html:57 +msgid "Non Public" +msgstr "" + #: templates/web/default/admin/council_list.html:5 #: templates/web/default/admin/report_edit.html:16 #, fuzzy @@ -1828,14 +1860,13 @@ msgstr "Nac ydw" msgid "Not reported before" msgstr "Wedi adrodd o'r blaen" -#: templates/web/default/report/_main.html:11 +#: templates/web/default/report/_main.html:14 #: templates/web/emptyhomes/report/display.html:24 -#: templates/web/fixmystreet/report/_main.html:13 msgid "Not reported to council" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" -#: templates/web/default/admin/council_contacts.html:40 -#: templates/web/default/admin/council_edit.html:46 +#: templates/web/default/admin/council_contacts.html:43 +#: templates/web/default/admin/council_edit.html:74 #, fuzzy msgid "Note" msgstr "Nac ydw" @@ -1847,8 +1878,8 @@ msgid "" "numbers may jump about a little" msgstr "" -#: templates/web/default/admin/council_contacts.html:89 -#: templates/web/default/admin/council_edit.html:31 +#: templates/web/default/admin/council_contacts.html:95 +#: templates/web/default/admin/council_edit.html:32 #, fuzzy msgid "Note:" msgstr "Nac ydw" @@ -1857,7 +1888,7 @@ msgstr "Nac ydw" msgid "Note: <strong>%s</strong>" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:149 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:164 msgid "Now to submit your report…" msgstr "" @@ -1867,11 +1898,11 @@ msgid "" "password?" msgstr "" -#: templates/web/fixmystreet/report/display.html:127 +#: templates/web/fixmystreet/report/update-form.html:81 msgid "Now to submit your update…" msgstr "" -#: templates/web/default/report/display.html:133 +#: templates/web/default/report/update-form.html:84 msgid "" "Now to submit your update… do you have a reportemptyhomes.com " "password?" @@ -1883,6 +1914,7 @@ msgid "Offensive? Unsuitable? Tell us" msgstr "Sarhaus? Anaddas? Rhowch wybod i ni" #: templates/web/default/reports/index.html:18 +#: templates/web/fixmybarangay/reports/index.html:22 #, fuzzy msgid "Old / unknown <br>empty properties" msgstr "ID eiddo gwag anhysbys" @@ -1897,11 +1929,13 @@ msgid "Old state" msgstr "" #: templates/web/default/reports/index.html:20 +#: templates/web/fixmybarangay/reports/index.html:24 #, fuzzy msgid "Older <br>returned to use" msgstr "Wedi'u hadfer i'w defnyddio ers amser" #: templates/web/default/reports/index.html:17 +#: templates/web/fixmybarangay/reports/index.html:21 #, fuzzy msgid "Older <br>empty properties" msgstr "Adroddiadau hŷn o eiddo gwag" @@ -1921,13 +1955,13 @@ msgstr "Adroddiadau hŷn o eiddo gwag" #: templates/web/bromley/report/display.html:80 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/update_edit.html:19 -#: templates/web/default/dashboard/index.html:136 -#: templates/web/default/report/display.html:79 -#: templates/web/fixmystreet/report/display.html:74 +#: templates/web/default/dashboard/index.html:138 +#: templates/web/default/report/update-form.html:30 +#: templates/web/fixmystreet/report/update-form.html:28 msgid "Open" msgstr "" -#: templates/web/default/my/my.html:22 templates/web/fixmystreet/my/my.html:22 +#: templates/web/default/my/my.html:22 templates/web/fixmystreet/my/my.html:26 #, fuzzy msgid "Open reports" msgstr "Cuddio hen adroddiadau " @@ -1959,15 +1993,15 @@ msgstr "" "Neu, gallwch danysgrifio am hysbysiad yn ôl pa ward neu gyngor yr ydych yn " "byw ynddo:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:655 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1006 #: perllib/FixMyStreet/App/Controller/Report/New.pm:656 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:497 -#: perllib/FixMyStreet/DB/Result/Problem.pm:507 -#: perllib/FixMyStreet/DB/Result/Problem.pm:517 -#: perllib/FixMyStreet/DB/Result/Problem.pm:529 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:329 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:338 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:657 +#: perllib/FixMyStreet/DB/Result/Problem.pm:505 +#: perllib/FixMyStreet/DB/Result/Problem.pm:515 +#: perllib/FixMyStreet/DB/Result/Problem.pm:525 +#: perllib/FixMyStreet/DB/Result/Problem.pm:537 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:331 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:340 msgid "Other" msgstr "Arall" @@ -1994,9 +2028,9 @@ msgstr "" #: templates/web/bromley/report/display.html:145 #: templates/web/bromley/report/new/fill_in_details_form.html:186 -#: templates/web/fixmystreet/auth/general.html:55 -#: templates/web/fixmystreet/report/display.html:157 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:197 +#: templates/web/fixmystreet/auth/general.html:59 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:218 +#: templates/web/fixmystreet/report/update-form.html:117 #, fuzzy msgid "Password (optional)" msgstr "(dewisol)" @@ -2007,13 +2041,14 @@ msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:136 #: templates/web/bromley/report/new/fill_in_details_form.html:183 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:133 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:194 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:148 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:215 +#: templates/web/zurich/report/new/fill_in_details_form.html:124 #, fuzzy msgid "Phone number (optional)" msgstr "(dewisol)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:260 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:262 #: templates/web/default/admin/report_edit.html:32 #: templates/web/default/report/new/fill_in_details_form.html:215 msgid "Phone:" @@ -2021,15 +2056,16 @@ msgstr "Rhif ffôn:" #: templates/web/bromley/report/display.html:109 #: templates/web/bromley/report/new/fill_in_details_form.html:104 -#: templates/web/fixmystreet/report/display.html:103 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:108 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:92 +#: templates/web/fixmystreet/report/update-form.html:57 +#: templates/web/zurich/report/new/fill_in_details_form.html:86 #, fuzzy msgid "Photo" msgstr "Ffotograff:" #: templates/web/default/questionnaire/index.html:95 -#: templates/web/default/report/display.html:109 #: templates/web/default/report/new/fill_in_details_form.html:102 +#: templates/web/default/report/update-form.html:60 #: templates/web/fixmystreet/questionnaire/index.html:90 msgid "Photo:" msgstr "Ffotograff:" @@ -2042,12 +2078,12 @@ msgstr "Ffotograffau o adroddiadau cyfagos diweddar" #: templates/web/bromley/report/display.html:81 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/dashboard/index.html:136 -#: templates/web/default/dashboard/index.html:137 -#: templates/web/default/report/display.html:79 -#: templates/web/default/report/display.html:80 -#: templates/web/fixmystreet/report/display.html:74 -#: templates/web/fixmystreet/report/display.html:75 +#: templates/web/default/dashboard/index.html:138 +#: templates/web/default/dashboard/index.html:139 +#: templates/web/default/report/update-form.html:30 +#: templates/web/default/report/update-form.html:31 +#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/fixmystreet/report/update-form.html:29 msgid "Planned" msgstr "" @@ -2081,16 +2117,16 @@ msgstr "Rhowch eich cyfeiriad e-bost" msgid "Please check your email address is correct" msgstr "Rhowch gyfeiriad e-bost dilys" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:819 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:826 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:845 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:884 -#: perllib/FixMyStreet/DB/Result/Problem.pm:347 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:822 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:829 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:848 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:891 +#: perllib/FixMyStreet/DB/Result/Problem.pm:355 #: templates/web/default/js/validation_strings.html:9 msgid "Please choose a category" msgstr "Dewiswch gategori" -#: perllib/FixMyStreet/DB/Result/Problem.pm:353 +#: perllib/FixMyStreet/DB/Result/Problem.pm:361 msgid "Please choose a property type" msgstr "Dewiswch fath o eiddo" @@ -2118,8 +2154,8 @@ msgstr "" #: templates/web/default/report/new/notes.html:7 #: templates/web/fixmystreet/report/new/notes.html:6 msgid "" -"Please do not be abusive — abusing your council devalues the service " -"for all users." +"Please do not be abusive — abusing your council devalues the " +"service for all users." msgstr "" #: perllib/FixMyStreet/DB/Result/Comment.pm:146 @@ -2134,7 +2170,7 @@ msgid "Please enter a password" msgstr "Ychwanegwch neges" #: perllib/FixMyStreet/App/Controller/Contact.pm:97 -#: perllib/FixMyStreet/DB/Result/Problem.pm:322 +#: perllib/FixMyStreet/DB/Result/Problem.pm:330 #: templates/web/default/js/validation_strings.html:3 msgid "Please enter a subject" msgstr "Rhowch enw'r pwnc" @@ -2150,7 +2186,7 @@ msgstr "Cofnodwch gyfeiriad e-bost dilys" msgid "Please enter a valid email address" msgstr "Cofnodwch gyfeiriad e-bost dilys" -#: perllib/FixMyStreet/DB/Result/Problem.pm:325 +#: perllib/FixMyStreet/DB/Result/Problem.pm:333 #: templates/web/default/js/validation_strings.html:4 msgid "Please enter some details" msgstr "Cofnodwch fanylion" @@ -2167,7 +2203,8 @@ msgid "Please enter your email" msgstr "Cofnodwch eich cyfeiriad e-bost" #: templates/web/bromley/report/new/fill_in_details_form.html:149 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:146 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:161 +#: templates/web/zurich/report/new/fill_in_details_form.html:110 #, fuzzy msgid "Please enter your email address" msgstr "Cofnodwch eich cyfeiriad e-bost" @@ -2177,7 +2214,7 @@ msgstr "Cofnodwch eich cyfeiriad e-bost" msgid "Please enter your first name" msgstr "Cofnodwch eich enw" -#: perllib/FixMyStreet/DB/Result/Problem.pm:340 +#: perllib/FixMyStreet/DB/Result/Problem.pm:348 #: templates/web/default/js/validation_strings.html:7 #, fuzzy msgid "" @@ -2189,7 +2226,7 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:95 #: perllib/FixMyStreet/DB/Result/Comment.pm:143 -#: perllib/FixMyStreet/DB/Result/Problem.pm:333 +#: perllib/FixMyStreet/DB/Result/Problem.pm:341 #: perllib/FixMyStreet/DB/Result/User.pm:97 #: templates/web/default/js/validation_strings.html:6 msgid "Please enter your name" @@ -2227,11 +2264,22 @@ msgstr "" #: templates/web/default/report/new/fill_in_details_text.html:1 #: templates/web/default/report/new/fill_in_details_text.html:11 +#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1 +#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 -#: templates/web/fixmystreet/report/new/fill_in_details_text.html:11 +#: templates/web/fixmystreet/report/new/fill_in_details_text.html:8 msgid "Please fill in details of the empty property below." msgstr "Llenwch fanylion yr eiddo gwag isod." +#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1 +#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:3 +msgid "" +"Please fill in details of the empty property below. Leave as much detail as " +"you can, \n" +"and if possible describe the exact location of\n" +"the empty property (e.g. if there is a streetlight number or road name)." +msgstr "" + #: templates/web/default/report/new/fill_in_details_text.html:1 #: templates/web/default/report/new/fill_in_details_text.html:3 msgid "" @@ -2244,14 +2292,16 @@ msgid "" "photo of the empty property if you have one), etc." msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:68 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:70 +#: templates/web/zurich/report/new/fill_in_details_form.html:64 #, fuzzy msgid "Please fill in details of the empty property." msgstr "Llenwch fanylion yr eiddo gwag isod." #: templates/web/bromley/report/new/fill_in_details_form.html:28 #: templates/web/default/report/new/fill_in_details_form.html:27 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:34 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:35 +#: templates/web/zurich/report/new/fill_in_details_form.html:35 #, fuzzy msgid "" "Please fill in the form below with details of the empty property, and " @@ -2260,7 +2310,7 @@ msgstr "" "Llenwch y ffurflen isod gyda manylion yr eiddo gwag,\n" "a disgrifiwch y lleoliad mor fanwl ag y bo modd yn y blwch manylion." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Nodwch a fyddech chi'n hoffi derbyn holiadur arall" @@ -2268,7 +2318,7 @@ msgstr "Nodwch a fyddech chi'n hoffi derbyn holiadur arall" msgid "Please note that updates are not sent to the council." msgstr "Sylwer nad yw diweddariadau'n cael eu hanfon at y cyngor." -#: templates/web/default/report/display.html:56 +#: templates/web/default/report/update-form.html:7 msgid "" "Please note that updates are not sent to the council. If you leave your name " "it will be public. Your information will only be used in accordance with our " @@ -2284,27 +2334,29 @@ msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:23 #: templates/web/default/report/new/fill_in_details_form.html:5 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:25 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:26 +#: templates/web/zurich/report/new/fill_in_details_form.html:26 msgid "" "Please note your report has <strong>not yet been sent</strong>. Choose a " "category and add further information below, then submit." msgstr "" #: templates/web/default/report/new/notes.html:1 +#: templates/web/fixmybarangay/report/new/notes.html:1 #: templates/web/fixmystreet/report/new/notes.html:1 msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:244 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:246 msgid "Please provide some explanation as to why you're reopening this report" msgstr "Rhowch ychydig o esboniad pam rydych yn ailagor yr adroddiad hwn" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:251 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 msgid "Please provide some text as well as a photo" msgstr "Rhowch rywfaint o destun yn ogystal â ffotograff" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:237 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239 msgid "" "Please say whether you've ever reported an empty property to your council " "before" @@ -2320,7 +2372,7 @@ msgstr "Dewiswch y porthiant rydych chi eisiau ei gael" msgid "Please select the type of alert you want" msgstr "Dewiswch y math o hysbysiad rydych chi eisiau ei gael" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:233 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235 msgid "Please state whether or not the empty property has been returned to use" msgstr "" "Cofnodwch a yw'r eiddo gwag wedi cael ei adfer i'w ddefnyddio, ai peidio" @@ -2329,11 +2381,11 @@ msgstr "" msgid "Please take a look at the updates that have been left." msgstr "Ewch i fwrw golwg ar y diweddariadau sydd wedi cael eu gadael." -#: perllib/FixMyStreet/App/Controller/Photo.pm:176 +#: perllib/FixMyStreet/App/Controller/Photo.pm:175 msgid "Please upload a JPEG image only" msgstr "Dim ond llun JPEG y dylech lwytho i fyny." -#: perllib/FixMyStreet/App/Controller/Photo.pm:183 +#: perllib/FixMyStreet/App/Controller/Photo.pm:182 #, fuzzy msgid "Please upload a JPEG image only\n" msgstr "Dim ond llun JPEG y dylech lwytho i fyny." @@ -2343,7 +2395,7 @@ msgid "Please write a message" msgstr "Ysgrifennwch neges" #: templates/web/bromley/report/display.html:70 -#: templates/web/fixmystreet/report/display.html:69 +#: templates/web/fixmystreet/report/update-form.html:23 #, fuzzy msgid "Please write your update here" msgstr "Rhowch eich enw" @@ -2352,13 +2404,13 @@ msgstr "Rhowch eich enw" #: templates/web/bromley/report/display.html:149 #: templates/web/bromley/report/display.html:161 #: templates/web/default/contact/index.html:93 -#: templates/web/default/report/display.html:119 -#: templates/web/default/report/display.html:156 -#: templates/web/default/report/display.html:178 +#: templates/web/default/report/update-form.html:107 +#: templates/web/default/report/update-form.html:129 +#: templates/web/default/report/update-form.html:70 #: templates/web/fixmystreet/contact/index.html:93 -#: templates/web/fixmystreet/report/display.html:115 -#: templates/web/fixmystreet/report/display.html:139 -#: templates/web/fixmystreet/report/display.html:161 +#: templates/web/fixmystreet/report/update-form.html:121 +#: templates/web/fixmystreet/report/update-form.html:69 +#: templates/web/fixmystreet/report/update-form.html:93 msgid "Post" msgstr "Postio" @@ -2375,6 +2427,12 @@ msgstr "Cofnodwyd gan %s am %s" msgid "Posted by %s at %s" msgstr "Cofnodwyd gan %s am %s" +#: templates/web/default/admin/council_contacts.html:100 +#: templates/web/default/admin/council_edit.html:30 +#: templates/web/default/admin/report_edit.html:43 +msgid "Private" +msgstr "" + #: templates/web/default/maps/openlayers.html:85 msgid "Empty property" msgstr "Eiddo gwag" @@ -2399,7 +2457,7 @@ msgstr "Eiddo gwag yn %s" msgid "Empty property breakdown by state" msgstr "ni fydd eich eiddo gwag yn cael ei bostio" -#: perllib/FixMyStreet/App/Controller/Admin.pm:819 +#: perllib/FixMyStreet/App/Controller/Admin.pm:849 #, fuzzy msgid "Empty property marked as open." msgstr "Ffurflen manylion eiddo gwag" @@ -2413,18 +2471,18 @@ msgstr "" msgid "Empty properties" msgstr "Eiddo gwag" -#: templates/web/default/around/display_location.html:81 +#: templates/web/default/around/_updates.html:1 msgid "Empty properties in this area" msgstr "Eiddo gwag yn yr ardal hon" #: templates/web/bromley/report/display.html:31 -#: templates/web/fixmystreet/around/display_location.html:98 -#: templates/web/fixmystreet/report/display.html:24 +#: templates/web/fixmystreet/around/tabbed_lists.html:4 +#: templates/web/fixmystreet/report/display.html:35 #, fuzzy msgid "Empty properties nearby" msgstr "Mwy o eiddo gwag cyfagos" -#: templates/web/fixmystreet/around/display_location.html:97 +#: templates/web/fixmystreet/around/tabbed_lists.html:3 #, fuzzy msgid "Empty properties on the map" msgstr "Eiddo gwag yn yr ardal hon" @@ -2443,24 +2501,25 @@ msgstr "" msgid "Empty properties within %.1fkm of this location" msgstr "Eiddo gwag o fewn %skm o'r lleoliad hwn" -#: perllib/FixMyStreet/Cobrand/Default.pm:609 +#: perllib/FixMyStreet/Cobrand/Default.pm:612 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:95 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:162 -#: perllib/FixMyStreet/Cobrand/UK.pm:240 +#: perllib/FixMyStreet/Cobrand/UK.pm:231 msgid "Empty properties within %s" msgstr "Eiddo gwag yn %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:103 -#: perllib/FixMyStreet/Cobrand/UK.pm:254 +#: perllib/FixMyStreet/Cobrand/UK.pm:245 msgid "Empty properties within %s ward" msgstr "Eiddo gwag yn ward %s" -#: templates/web/default/reports/council.html:0 -#: templates/web/default/reports/council.html:29 +#: templates/web/default/reports/body.html:0 +#: templates/web/default/reports/body.html:29 msgid "Empty properties within %s, reportemptyhomes.com" msgstr "Eiddo gwag o fewn %s, reportemptyhomes.com" #: templates/web/default/alert/_list.html:40 +#: templates/web/fixmybarangay/alert/_list.html:13 #: templates/web/fixmystreet/alert/_list.html:42 msgid "Empty properties within the boundary of:" msgstr "Eiddo gwag o fewn ffiniau:" @@ -2471,19 +2530,19 @@ msgstr "" "Eiddo y cafwyd adroddiadau diweddar ar reportemptyhomes.com eu bod wedi cael " "eu hadfer i'w defnyddio" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:617 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:616 msgid "Property type:" msgstr "Math o eiddo:" #: templates/web/bromley/report/new/fill_in_details_form.html:52 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:62 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:64 #, fuzzy msgid "Provide a title" msgstr "Rhowch ddiweddariad" #: templates/web/bromley/report/display.html:57 -#: templates/web/default/report/display.html:51 -#: templates/web/fixmystreet/report/display.html:50 +#: templates/web/default/report/update-form.html:3 +#: templates/web/fixmystreet/report/update-form.html:4 msgid "Provide an update" msgstr "Rhowch ddiweddariad" @@ -2494,15 +2553,20 @@ msgid "" msgstr "" #: templates/web/bromley/report/display.html:142 -#: templates/web/default/report/display.html:175 #: templates/web/default/report/new/fill_in_details_form.html:173 -#: templates/web/fixmystreet/report/display.html:154 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:191 +#: templates/web/default/report/update-form.html:126 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:212 +#: templates/web/fixmystreet/report/update-form.html:114 msgid "" "Providing a password is optional, but doing so will allow you to more easily " "report empty properties, leave updates and manage your reports." msgstr "" +#: templates/web/default/admin/council_contacts.html:44 +#: templates/web/default/admin/council_contacts.html:57 +msgid "Public" +msgstr "" + #: templates/web/default/questionnaire/completed.html:1 #: templates/web/default/questionnaire/completed.html:2 #: templates/web/default/questionnaire/index.html:0 @@ -2525,7 +2589,7 @@ msgstr "Llenwyd yr holiadur gan yr unigolyn a roddodd wybod am yr eiddo gwag" msgid "Questionnaire %d sent for empty property %d" msgstr "Llenwyd yr holiadur gan yr unigolyn a roddodd wybod am yr eiddo gwag" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:190 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by empty property reporter" msgstr "Llenwyd yr holiadur gan yr unigolyn a roddodd wybod am yr eiddo gwag" @@ -2537,18 +2601,16 @@ msgstr "Llenwyd yr holiadur gan yr unigolyn a roddodd wybod am yr eiddo gwag" #: templates/web/default/reports/_rss.html:1 #: templates/web/fixmystreet/alert/_list.html:22 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/around/display_location.html:1 -#: templates/web/fixmystreet/around/display_location.html:3 -#: templates/web/fixmystreet/report/display.html:30 +#: templates/web/fixmystreet/report/display.html:49 msgid "RSS feed" msgstr "Porthiant RSS" -#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 +#: perllib/FixMyStreet/Cobrand/UK.pm:274 perllib/FixMyStreet/Cobrand/UK.pm:286 #, fuzzy msgid "RSS feed for %s" msgstr "Porthiant RSS %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:289 perllib/FixMyStreet/Cobrand/UK.pm:301 +#: perllib/FixMyStreet/Cobrand/UK.pm:280 perllib/FixMyStreet/Cobrand/UK.pm:292 #, fuzzy msgid "RSS feed for %s ward, %s" msgstr "Porthiant RSS %s" @@ -2557,11 +2619,11 @@ msgstr "Porthiant RSS %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:186 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:196 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:204 -#: perllib/FixMyStreet/Cobrand/UK.pm:309 perllib/FixMyStreet/Cobrand/UK.pm:321 +#: perllib/FixMyStreet/Cobrand/UK.pm:300 perllib/FixMyStreet/Cobrand/UK.pm:312 msgid "RSS feed of %s" msgstr "Porthiant RSS %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:314 perllib/FixMyStreet/Cobrand/UK.pm:326 +#: perllib/FixMyStreet/Cobrand/UK.pm:305 perllib/FixMyStreet/Cobrand/UK.pm:317 #, fuzzy msgid "RSS feed of %s, within %s ward" msgstr "Porthiant RSS %s" @@ -2575,31 +2637,29 @@ msgstr "Porthiant RSS o eiddo gwag sydd gerllaw" msgid "RSS feed of empty properties in this %s" msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn" -#: perllib/FixMyStreet/Cobrand/Default.pm:610 +#: perllib/FixMyStreet/Cobrand/Default.pm:613 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:96 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161 -#: perllib/FixMyStreet/Cobrand/UK.pm:247 +#: perllib/FixMyStreet/Cobrand/UK.pm:238 #, fuzzy msgid "RSS feed of empty properties within %s" msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:102 -#: perllib/FixMyStreet/Cobrand/UK.pm:253 +#: perllib/FixMyStreet/Cobrand/UK.pm:244 #, fuzzy msgid "RSS feed of empty properties within %s ward" msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn" #: templates/web/default/around/display_location.html:1 #: templates/web/default/around/display_location.html:4 -#: templates/web/fixmystreet/around/display_location.html:1 -#: templates/web/fixmystreet/around/display_location.html:4 msgid "RSS feed of recent local empty properties" msgstr "Porthiant RSS o eiddo gwag lleol diweddar" #: templates/web/bromley/report/display.html:37 #: templates/web/default/report/display.html:42 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:30 +#: templates/web/fixmystreet/report/display.html:49 msgid "RSS feed of updates to this empty property" msgstr "Porthiant RSS o ddiweddariadau i'r eiddo gwag hwn" @@ -2607,7 +2667,7 @@ msgstr "Porthiant RSS o ddiweddariadau i'r eiddo gwag hwn" #: templates/web/default/alert/updates.html:9 #: templates/web/default/report/display.html:33 #: templates/web/fixmystreet/alert/updates.html:14 -#: templates/web/fixmystreet/report/display.html:32 +#: templates/web/fixmystreet/report/display.html:51 msgid "Receive email when updates are left on this empty property." msgstr "" "Derbyn neges e-bost pan fydd diweddariadau'n cael eu rhoi am yr eiddo gwag " @@ -2615,12 +2675,11 @@ msgstr "" #: templates/web/default/around/display_location.html:0 #: templates/web/default/around/display_location.html:34 -#: templates/web/fixmystreet/around/display_location.html:0 -#: templates/web/fixmystreet/around/display_location.html:34 msgid "Recent local empty properties, reportemptyhomes.com" msgstr "Eiddo gwag lleol diweddar, reportemptyhomes.com" #: templates/web/default/reports/index.html:19 +#: templates/web/fixmybarangay/reports/index.html:23 #, fuzzy msgid "Recently <br>returned to use" msgstr "Wedi'u hadfer i'w defnyddio'n ddiweddar" @@ -2631,7 +2690,7 @@ msgstr "Wedi'u hadfer i'w defnyddio'n ddiweddar" msgid "Recently returned to use" msgstr "Wedi'u hadfer i'w defnyddio'n ddiweddar" -#: templates/web/default/index.html:50 templates/web/fixmystreet/index.html:62 +#: templates/web/default/index.html:37 templates/web/fixmystreet/index.html:45 msgid "Recently reported empty properties" msgstr "Eiddo gwag yr adroddwyd amdanynt yn ddiweddar" @@ -2644,11 +2703,17 @@ msgid "" "council directly using their own website." msgstr "" +#: templates/web/fixmybarangay/report/new/notes.html:9 +msgid "" +"Remember that, for the pilot project, FixMyBarangay is only for reporting " +"potholes and streetlights in bgy. Luz or Basak San Nicolas." +msgstr "" + #: templates/web/default/admin/report_blocks.html:16 msgid "Remove flag" msgstr "" -#: templates/web/default/admin/report_edit.html:53 +#: templates/web/default/admin/report_edit.html:54 #: templates/web/default/admin/update_edit.html:48 msgid "Remove photo (can't be undone!)" msgstr "" @@ -2662,12 +2727,13 @@ msgstr "Adrodd am Eiddo Gwag" #: templates/web/fiksgatami/footer.html:5 #: templates/web/fiksgatami/nn/footer.html:5 #: templates/web/fixmystreet/footer.html:45 -#: templates/web/reading/footer.html:6 +#: templates/web/reading/footer.html:6 templates/web/stevenage/footer.html:39 +#: templates/web/zurich/footer.html:10 msgid "Report a property" msgstr "Rhoi gwybod am eiddo" #: templates/web/bromley/report/display.html:28 -#: templates/web/fixmystreet/report/display.html:22 +#: templates/web/fixmystreet/report/display.html:29 #, fuzzy msgid "Report abuse" msgstr "Adroddiadau" @@ -2677,13 +2743,15 @@ msgstr "Adroddiadau" msgid "Report empty properties" msgstr "Adrodd am eiddo gwag a gweld y rhain" -#: perllib/FixMyStreet/App/Controller/Rss.pm:277 +#: perllib/FixMyStreet/App/Controller/Rss.pm:286 #, fuzzy msgid "Report on %s" msgstr "Adroddiadau" #: templates/web/default/index.html:15 -#: templates/web/fixmystreet/around/postcode_form.html:6 +#: templates/web/fixmystreet/around/intro.html:1 +#: templates/web/stevenage/around/intro.html:1 +#: templates/web/zurich/around/intro.html:1 msgid "Report and view empty properties" msgstr "Adrodd am eiddo gwag a gweld y rhain" @@ -2697,7 +2765,7 @@ msgstr "Adroddiadau" msgid "Reported %s, to %s" msgstr "Adroddwyd gan %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:512 +#: perllib/FixMyStreet/DB/Result/Problem.pm:520 #: templates/web/default/contact/index.html:45 #: templates/web/fixmystreet/contact/index.html:46 msgid "Reported anonymously at %s" @@ -2709,33 +2777,33 @@ msgstr "Adroddwyd yn ddi-enw am %s" msgid "Reported before" msgstr "Wedi adrodd o'r blaen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:504 +#: perllib/FixMyStreet/DB/Result/Problem.pm:512 msgid "Reported by %s anonymously at %s" msgstr "Adroddwyd gan %s yn ddi-enw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:535 +#: perllib/FixMyStreet/DB/Result/Problem.pm:543 #: templates/web/default/contact/index.html:47 #: templates/web/fixmystreet/contact/index.html:48 msgid "Reported by %s at %s" msgstr "Adroddwyd gan %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:526 +#: perllib/FixMyStreet/DB/Result/Problem.pm:534 msgid "Reported by %s by %s at %s" msgstr "Adroddwyd gan %s trwy %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:500 +#: perllib/FixMyStreet/DB/Result/Problem.pm:508 msgid "Reported by %s in the %s category anonymously at %s" msgstr "Adroddwyd am hyn gan %s yn y categori %s yn ddi-enw, am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:520 +#: perllib/FixMyStreet/DB/Result/Problem.pm:528 msgid "Reported by %s in the %s category by %s at %s" msgstr "Adroddwyd gan %s yn y categori %s trwy %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:508 +#: perllib/FixMyStreet/DB/Result/Problem.pm:516 msgid "Reported in the %s category anonymously at %s" msgstr "Adroddiwyd yn y categori %s yn ddi-enw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:530 +#: perllib/FixMyStreet/DB/Result/Problem.pm:538 msgid "Reported in the %s category by %s at %s" msgstr "Adroddwyd yn y categori %s gan %s am %s" @@ -2747,10 +2815,15 @@ msgstr "Adroddwyd yn y categori %s gan %s am %s" #: templates/web/fixmystreet/report/new/fill_in_details.html:0 #: templates/web/fixmystreet/report/new/fill_in_details.html:5 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 +#: templates/web/zurich/report/new/fill_in_details_form.html:2 msgid "Reporting an empty property" msgstr "Adrodd am eiddo gwag" -#: templates/web/default/around/display_location.html:95 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1033 +msgid "Reports" +msgstr "Adroddiadau" + +#: templates/web/default/around/tabbed_lists.html:3 msgid "Reports on and around the map" msgstr "Adroddiadau ar ac yng nghyffiniau'r map" @@ -2759,43 +2832,31 @@ msgstr "Adroddiadau ar ac yng nghyffiniau'r map" msgid "Resend report" msgstr "Cuddio hen adroddiadau " -#: perllib/FixMyStreet/Geocode/OSM.pm:166 +#: perllib/FixMyStreet/Geocode/OSM.pm:173 msgid "" "Road operator for this named road (derived from road reference number and " "type): %s" msgstr "" -#: perllib/FixMyStreet/Geocode/OSM.pm:163 +#: perllib/FixMyStreet/Geocode/OSM.pm:170 msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: templates/web/default/admin/council_edit.html:35 +#: templates/web/default/admin/council_edit.html:63 msgid "Save changes" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1027 -#, fuzzy -msgid "Search Abuse" -msgstr "Adroddiadau cryno" - -#: templates/web/default/admin/search_abuse.html:1 -msgid "Search Abuse Table" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Admin.pm:1023 #: templates/web/default/admin/list_flagged.html:1 #: templates/web/default/admin/search_reports.html:1 #, fuzzy msgid "Search Reports" msgstr "Adroddiadau cryno" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1026 #: templates/web/default/admin/search_users.html:1 #, fuzzy msgid "Search Users" msgstr "Adroddiadau cryno" -#: templates/web/default/admin/search_abuse.html:4 #: templates/web/default/admin/search_reports.html:5 #: templates/web/default/admin/search_users.html:5 msgid "Search:" @@ -2812,7 +2873,7 @@ msgstr "" "porthiant RSS,\n" "neu rhowch eich cyfeiriad e-bost i danysgrifio am hysbysiad e-bost." -#: perllib/FixMyStreet/DB/Result/Problem.pm:618 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 msgid "Sent to %s %s later" msgstr "Anfonwyd at %s %s yn ddiweddarach" @@ -2825,6 +2886,10 @@ msgstr "Pwnc:" msgid "Service:" msgstr "" +#: templates/web/fixmystreet/report/display.html:33 +msgid "Share" +msgstr "" + #: templates/web/emptyhomes/static/about.html:21 msgid "Shelter Cymru" msgstr "" @@ -2868,32 +2933,30 @@ msgstr "" #: templates/web/bromley/report/display.html:203 #: templates/web/bromley/report/new/fill_in_details_form.html:129 #: templates/web/bromley/report/new/fill_in_details_form.html:175 -#: templates/web/default/report/display.html:208 #: templates/web/default/report/new/fill_in_details_form.html:210 -#: templates/web/fixmystreet/report/display.html:185 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:126 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:186 +#: templates/web/default/report/update-form.html:155 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:139 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:207 +#: templates/web/fixmystreet/report/update-form.html:142 msgid "Show my name publicly" msgstr "" -#: templates/web/default/around/display_location.html:60 -#: templates/web/fixmystreet/around/display_location.html:60 +#: templates/web/default/around/display_location.html:65 msgid "Show old" msgstr "" -#: templates/web/default/around/display_location.html:51 -#: templates/web/fixmystreet/around/display_location.html:52 +#: templates/web/default/around/display_location.html:56 msgid "Show pins" msgstr "Dangos pinnau" #: templates/web/default/auth/general.html:3 #: templates/web/default/auth/general.html:49 -#: templates/web/fixmybarangay/header.html.orig:46 +#: templates/web/fixmybarangay/header.html:68 #: templates/web/fixmystreet/auth/general.html:3 -#: templates/web/fixmystreet/auth/general.html:38 -#: templates/web/fixmystreet/auth/general.html:58 -#: templates/web/fixmystreet/header.html:51 -#: templates/web/zurich/header.html:51 +#: templates/web/fixmystreet/auth/general.html:42 +#: templates/web/fixmystreet/auth/general.html:62 +#: templates/web/fixmystreet/header.html:53 +#: templates/web/stevenage/header.html:101 templates/web/zurich/header.html:51 msgid "Sign in" msgstr "" @@ -2912,6 +2975,7 @@ msgstr "" #: templates/web/emptyhomes/header.html:41 #: templates/web/fiksgatami/header.html:22 #: templates/web/fiksgatami/nn/header.html:22 +#: templates/web/fixmybarangay/auth/sign_out.html:1 #: templates/web/lichfielddc/header.html:177 #: templates/web/reading/header.html:33 msgid "Sign out" @@ -2927,11 +2991,13 @@ msgid "Signed in as %s" msgstr "" #: templates/web/default/report/new/fill_in_details_text.html:1 +#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1 #: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 msgid "Some categories may require additional information." msgstr "" #: templates/web/default/alert/index.html:42 +#: templates/web/fixmybarangay/alert/index.html:32 msgid "Some photos of recent reports" msgstr "Rhai ffotograffau o adroddiadau diweddar" @@ -2944,7 +3010,7 @@ msgstr "" msgid "Some unconfirmeds" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:97 +#: perllib/FixMyStreet/Cobrand/UK.pm:89 msgid "" "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2953,15 +3019,16 @@ msgstr "" msgid "Sorry, there has been an error confirming your empty property." msgstr "Sori, bu gwall wrth gadarnhau eich eiddo gwag." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:214 -#: perllib/FixMyStreet/Geocode.pm:27 perllib/FixMyStreet/Geocode/Bing.pm:51 -#: perllib/FixMyStreet/Geocode/Google.pm:69 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:211 +#: perllib/FixMyStreet/Geocode.pm:28 perllib/FixMyStreet/Geocode/Bing.pm:58 +#: perllib/FixMyStreet/Geocode/Google.pm:74 +#: perllib/FixMyStreet/Geocode/OSM.pm:66 msgid "Sorry, we could not find that location." msgstr "Sori, ni fu modd i ni ddod o hyd i'r lleoliad hwnnw." -#: perllib/FixMyStreet/Geocode/Bing.pm:46 -#: perllib/FixMyStreet/Geocode/Google.pm:64 -#: perllib/FixMyStreet/Geocode/OSM.pm:59 +#: perllib/FixMyStreet/Geocode/Bing.pm:53 +#: perllib/FixMyStreet/Geocode/Google.pm:69 +#: perllib/FixMyStreet/Geocode/Zurich.pm:82 msgid "Sorry, we could not parse that location. Please try again." msgstr "" "Sori, ni fu modd i ni ddosrannu'r lleoliad hwnnw. Rhowch gynnig arall arni." @@ -2989,19 +3056,19 @@ msgstr "" #: templates/web/default/admin/list_flagged.html:18 #: templates/web/default/admin/list_updates.html:6 #: templates/web/default/admin/search_reports.html:21 -#: templates/web/fixmystreet/report/display.html:72 +#: templates/web/fixmystreet/report/update-form.html:26 #, fuzzy msgid "State" msgstr "Diweddariad:" #: templates/web/default/admin/report_edit.html:17 #: templates/web/default/admin/update_edit.html:18 -#: templates/web/default/report/display.html:77 +#: templates/web/default/report/update-form.html:28 #, fuzzy msgid "State:" msgstr "Diweddariad:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1029 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1038 #: templates/web/default/admin/stats.html:1 #, fuzzy msgid "Stats" @@ -3014,7 +3081,7 @@ msgstr "Anfon yr holiadur" #: templates/web/bromley/report/new/fill_in_details_form.html:48 #: templates/web/fixmystreet/contact/index.html:79 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:58 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:60 #, fuzzy msgid "Subject" msgstr "Pwnc:" @@ -3032,13 +3099,14 @@ msgstr "Pwnc:" #: templates/web/default/report/new/fill_in_details_form.html:114 #: templates/web/default/report/new/fill_in_details_form.html:154 #: templates/web/default/report/new/fill_in_details_form.html:176 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:137 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:162 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:201 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:152 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:177 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:222 +#: templates/web/zurich/report/new/fill_in_details_form.html:128 msgid "Submit" msgstr "Anfon" -#: templates/web/default/admin/report_edit.html:56 +#: templates/web/default/admin/report_edit.html:57 #: templates/web/default/admin/update_edit.html:51 #: templates/web/default/admin/user_edit.html:20 #, fuzzy @@ -3054,16 +3122,24 @@ msgstr "Anfon yr holiadur" #: templates/web/default/alert/updates.html:17 #: templates/web/default/report/display.html:38 #: templates/web/fixmystreet/alert/updates.html:23 -#: templates/web/fixmystreet/report/display.html:37 +#: templates/web/fixmystreet/report/display.html:56 msgid "Subscribe" msgstr "Tanysgrifio" #: templates/web/default/alert/_list.html:97 +#: templates/web/fixmybarangay/alert/_list.html:42 #: templates/web/fixmystreet/alert/_list.html:92 msgid "Subscribe me to an email alert" msgstr "Dymunaf danysgrifio i rybuddion drwy e-bost" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1021 +#: templates/web/fixmybarangay/alert/_list.html:6 +#, fuzzy +msgid "Subscribe to an alert based upon what baranagay you’re in:" +msgstr "" +"Neu, gallwch danysgrifio am hysbysiad yn ôl pa ward neu gyngor yr ydych yn " +"byw ynddo:" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1031 #: templates/web/default/admin/index.html:1 #, fuzzy msgid "Summary" @@ -3073,10 +3149,14 @@ msgstr "Adroddiadau cryno" #: templates/web/emptyhomes/reports/index.html:1 #: templates/web/fiksgatami/nn/reports/index.html:1 #: templates/web/fiksgatami/reports/index.html:1 +#: templates/web/fixmybarangay/reports/index.html:1 msgid "Summary reports" msgstr "Adroddiadau cryno" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1025 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1035 +msgid "Survey" +msgstr "" + #: templates/web/default/admin/questionnaire.html:1 msgid "Survey Results" msgstr "" @@ -3085,7 +3165,7 @@ msgstr "" msgid "Text" msgstr "" -#: templates/web/default/admin/council_contacts.html:18 +#: templates/web/default/admin/council_contacts.html:20 msgid "Text only version" msgstr "" @@ -3185,14 +3265,14 @@ msgstr "" "i ni'ch holi chi, a ydych erioed wedi rhoi gwybod i'r cyngor am eiddo gwag " "cyn hyn?" -#: perllib/FixMyStreet/App/Controller/Photo.pm:190 +#: perllib/FixMyStreet/App/Controller/Photo.pm:189 msgid "" "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" "Nid yw'n ymddangos bod y ddelwedd honno wedi llwytho i fyny'n gywir (%s), " "rhowch gynnig arni eto." -#: perllib/FixMyStreet/App/Controller/Council.pm:91 +#: perllib/FixMyStreet/App/Controller/Council.pm:90 #, fuzzy msgid "" "That location does not appear to be covered by a council; perhaps it is " @@ -3201,7 +3281,7 @@ msgstr "" "Nid yw'n ymddangos bod cyngor yn gyfrifol am y lleoliad hwnnw, efallai ei " "fod ar y môr - chwiliwch am fan mwy penodol." -#: perllib/FixMyStreet/App/Controller/Location.pm:107 +#: perllib/FixMyStreet/App/Controller/Location.pm:121 #, fuzzy msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -3209,16 +3289,21 @@ msgstr "" "arni." #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:90 +#: perllib/FixMyStreet/Cobrand/UK.pm:82 msgid "That postcode was not recognised, sorry." msgstr "Ni chafodd y cod post hwnnw ei gydnabod, sori." -#: perllib/FixMyStreet/App/Controller/Admin.pm:605 +#: perllib/FixMyStreet/App/Controller/Admin.pm:616 #, fuzzy msgid "That empty property will now be resent." msgstr "ni fydd eich eiddo gwag yn cael ei bostio" -#: perllib/FixMyStreet/App/Controller/Report.pm:75 +#: perllib/FixMyStreet/App/Controller/Report.pm:98 +#, fuzzy +msgid "That report cannot be viewed on reportemptyhomes.com." +msgstr "Mae'r adroddiad hwnnw wedi cael ei dynnu oddi ar reportemptyhomes.com" + +#: perllib/FixMyStreet/App/Controller/Report.pm:92 msgid "That report has been removed from reportemptyhomes.com." msgstr "Mae'r adroddiad hwnnw wedi cael ei dynnu oddi ar reportemptyhomes.com" @@ -3274,11 +3359,9 @@ msgstr "" #: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 #: templates/web/fixmystreet/report/new/fill_in_details_text.html:3 msgid "" -"The council won’t be able to help unless you leave as much\n" -"detail as you can. Please describe the exact location of the empty property " -"(e.g. on a\n" -"wall), what it is, how long it has been there, a description (and a photo " -"of\n" +"The council won’t be able to help unless you leave as much detail as " +"you can. Please describe the exact location of the empty property (e.g. on a " +"wall), what it is, how long it has been there, a description (and a photo of " "the empty property if you have one), etc." msgstr "" @@ -3295,8 +3378,8 @@ msgid "" msgstr "Mae manylion eich eiddo gwag ar gael ar ochr dde'r dudalen hon." #: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:44 -#: perllib/FixMyStreet/App/Controller/Reports.pm:75 +#: perllib/FixMyStreet/App/Controller/Reports.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:74 #, fuzzy msgid "The error was: %s" msgstr "Testun y gwall oedd:" @@ -3308,7 +3391,7 @@ msgid "" "requested_datetime, updated_datetime, service_code and service_name." msgstr "" -#: perllib/FixMyStreet/Geocode/OSM.pm:158 +#: perllib/FixMyStreet/Geocode/OSM.pm:165 msgid "" "The following information about the nearest road might be inaccurate or " "irrelevant, if the empty property is close to several roads or close to a " @@ -3405,12 +3488,13 @@ msgstr "Yr hysbysiad symlaf yw ein hysbysiad daearyddol:" #: templates/web/default/report/new/councils_text_some.html:11 #: templates/web/default/report/new/fill_in_details_form.html:17 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 +#: templates/web/zurich/report/new/fill_in_details_form.html:12 msgid "" "The subject and details of the empty property will be public, plus your name " "if you give us permission." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:269 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:271 msgid "" "The user could not locate the empty property on a map, but to see the area " "around the location they entered" @@ -3418,7 +3502,7 @@ msgstr "" "Ni allai'r defnyddiwr leoli'r eiddo gwag ar fap, ond i weld yr ardal o " "gwmpas y lleoliad a gofnodwyd ganddynt " -#: perllib/FixMyStreet/App/Controller/Reports.pm:72 +#: perllib/FixMyStreet/App/Controller/Reports.pm:71 msgid "" "There was an empty property showing the All Reports page. Please try again " "later." @@ -3429,8 +3513,8 @@ msgstr "" msgid "There was an empty property showing this page. Please try again later." msgstr "Cafwyd anhawsterau gyda'ch diweddariad. Gweler isod" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:733 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:130 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:736 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 #: templates/web/default/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:24 msgid "" @@ -3445,7 +3529,7 @@ msgid "" "again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:256 #, fuzzy msgid "There was an empty property with your update. Please try again." msgstr "Cafwyd anhawsterau gyda'ch diweddariad. Gweler isod" @@ -3454,7 +3538,7 @@ msgstr "Cafwyd anhawsterau gyda'ch diweddariad. Gweler isod" msgid "There were problems with your report. Please see below." msgstr "Cafwyd anhawsterau gyda'ch adroddiad. Gweler isod." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:279 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:283 msgid "There were problems with your update. Please see below." msgstr "Cafwyd anhawsterau gyda'ch diweddariad. Gweler isod" @@ -3464,7 +3548,7 @@ msgid "" "change without warnings in the future." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:339 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:341 msgid "" "This email has been sent to both councils covering the location of the empty " "property, as the user did not categorise it; please ignore it if you're not " @@ -3472,15 +3556,15 @@ msgid "" "empty property this is so we can add it to our system." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:342 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:344 msgid "" "This email has been sent to several councils covering the location of the " "empty property, as the category selected is provided for all of them; please " "ignore it if you're not the correct council to deal with the issue." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:865 -#: perllib/FixMyStreet/Cobrand/UK.pm:62 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:868 +#: perllib/FixMyStreet/Cobrand/UK.pm:54 msgid "This information is required" msgstr "" @@ -3491,14 +3575,23 @@ msgid "" "will be periodically deleted." msgstr "Safle datblygwr yw hwn; gallai pethau dorri unrhyw bryd." -#: templates/web/emptyhomes/reports/council.html:58 +#: templates/web/emptyhomes/reports/body.html:58 msgid "This is a summary of all reports for one %s." msgstr "Dyma grynodeb o'r holl adroddiadau ar gyfer y %s." -#: templates/web/emptyhomes/reports/council.html:60 +#: templates/web/emptyhomes/reports/body.html:60 msgid "This is a summary of all reports for this %s." msgstr "" +#: templates/web/fixmybarangay/reports/index.html:7 +#, fuzzy +msgid "" +"This is a summary of all reports on this site; select a particular barangay " +"to see the reports sent there." +msgstr "" +"Dyma grynodeb o'r holl adroddiadau ar y safle hwn; dewiswch gyngor penodol i " +"weld yr adroddiadau a anfonwyd ato." + #: templates/web/default/reports/index.html:7 #: templates/web/emptyhomes/reports/index.html:4 #: templates/web/fiksgatami/nn/reports/index.html:4 @@ -3517,15 +3610,15 @@ msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio" #: templates/web/bromley/report/display.html:96 #: templates/web/default/report/banner.html:12 -#: templates/web/default/report/display.html:95 +#: templates/web/default/report/update-form.html:46 #: templates/web/emptyhomes/report/display.html:12 -#: templates/web/fixmystreet/report/display.html:90 +#: templates/web/fixmystreet/report/update-form.html:44 msgid "This empty property has been returned to use" msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio" #: templates/web/bromley/report/display.html:90 -#: templates/web/default/report/display.html:90 -#: templates/web/fixmystreet/report/display.html:84 +#: templates/web/default/report/update-form.html:41 +#: templates/web/fixmystreet/report/update-form.html:38 #, fuzzy msgid "This empty property has not been returned to use" msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio" @@ -3539,21 +3632,21 @@ msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio" msgid "This empty property is old and of unknown status." msgstr "Mae'r eiddo gwag hwn yn hen ac nid yw ei statws yn hysbys." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:83 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 #, fuzzy msgid "This report is currently marked as closed." msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:81 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84 #, fuzzy msgid "This report is currently marked as returned to use." msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:85 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88 msgid "This report is currently marked as open." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:262 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:264 msgid "" "This web page also contains a photo of the empty property, provided by the " "user." @@ -3561,7 +3654,7 @@ msgstr "" "Mae'r dudalen we hon hefyd yn cynnwys ffotograff o'r eiddo gwag, wedi'i " "ddarparu gan y defnyddiwr." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1024 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1034 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -3571,7 +3664,7 @@ msgstr "" msgid "Title" msgstr "" -#: templates/web/default/around/display_location.html:69 +#: templates/web/default/around/_report_banner.html:2 #, fuzzy msgid "" "To <strong>report an empty property</strong>, click on the map at the " @@ -3599,7 +3692,7 @@ msgstr "" "ward chi,\n" "cofnodwch eich cod post Prydeinig neu enw stryd ac ardal:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:268 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:270 msgid "To view a map of the precise location of this issue" msgstr "Gweld map o union leoliad y broblem hon" @@ -3610,7 +3703,7 @@ msgstr "Gweld map o union leoliad y broblem hon" msgid "Total" msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:42 msgid "Unable to look up areas in MaPit. Please try again later." msgstr "" @@ -3624,17 +3717,17 @@ msgstr "" msgid "Unknown" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:164 +#: perllib/FixMyStreet/App/Controller/Rss.pm:173 #, fuzzy msgid "Unknown alert type" msgstr "ID eiddo gwag anhysbys" -#: perllib/FixMyStreet/App/Controller/Report.pm:70 +#: perllib/FixMyStreet/App/Controller/Report.pm:87 msgid "Unknown empty property ID" msgstr "ID eiddo gwag anhysbys" #: templates/web/bromley/report/display.html:66 -#: templates/web/fixmystreet/report/display.html:65 +#: templates/web/fixmystreet/report/update-form.html:19 #, fuzzy msgid "Update" msgstr "Diweddariad:" @@ -3682,18 +3775,18 @@ msgstr "" msgid "Update reopened empty property" msgstr "Sut i roi gwybod am eiddo gwag" -#: templates/web/default/admin/council_contacts.html:62 +#: templates/web/default/admin/council_contacts.html:68 #, fuzzy msgid "Update statuses" msgstr "Diweddariadau" -#: templates/web/default/report/display.html:71 +#: templates/web/default/report/update-form.html:22 msgid "Update:" msgstr "Diweddariad:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:694 -#: perllib/FixMyStreet/App/Controller/Admin.pm:809 -#: perllib/FixMyStreet/App/Controller/Admin.pm:889 +#: perllib/FixMyStreet/App/Controller/Admin.pm:708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:839 +#: perllib/FixMyStreet/App/Controller/Admin.pm:899 #, fuzzy msgid "Updated!" msgstr "Diweddariadau" @@ -3717,20 +3810,21 @@ msgstr "Diweddariadau am {{title}}" msgid "Updates to this empty property, reportemptyhomes.com" msgstr "Diweddariadau i'r eiddo gwag hwn, reportemptyhomes.com" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1182 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1191 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1154 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1163 msgid "User flagged" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 #: templates/web/default/admin/list_flagged.html:30 msgid "Users" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:309 -#: perllib/FixMyStreet/App/Controller/Admin.pm:339 +#: perllib/FixMyStreet/App/Controller/Admin.pm:315 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 #, fuzzy msgid "Values updated" msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" @@ -3741,7 +3835,7 @@ msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" msgid "View report on site" msgstr "Adroddiadau" -#: templates/web/default/reports/council.html:18 +#: templates/web/default/reports/body.html:18 #, fuzzy msgid "View reports by ward" msgstr "Adroddiadau" @@ -3754,20 +3848,19 @@ msgstr "Gweld eich adroddiad" #: templates/web/default/around/display_location.html:33 #: templates/web/emptyhomes/around/display_location.html:0 #: templates/web/emptyhomes/around/display_location.html:16 -#: templates/web/fixmystreet/around/display_location.html:0 -#: templates/web/fixmystreet/around/display_location.html:33 msgid "Viewing a location" msgstr "Gweld lleoliad" #: templates/web/bromley/report/display.html:0 #: templates/web/default/report/display.html:0 +#: templates/web/emptyhomes/report/display.html:1 #: templates/web/emptyhomes/report/display.html:2 #: templates/web/fixmystreet/report/display.html:0 msgid "Viewing an empty property" msgstr "Gweld eiddo gwag" -#: templates/web/default/reports/council.html:20 -#: templates/web/emptyhomes/reports/council.html:18 +#: templates/web/default/reports/body.html:20 +#: templates/web/emptyhomes/reports/body.html:18 msgid "Wards of this council" msgstr "" @@ -3794,28 +3887,29 @@ msgid "" msgstr "" #: templates/web/bromley/report/display.html:141 -#: templates/web/fixmystreet/report/display.html:153 +#: templates/web/fixmystreet/report/update-form.html:113 #, fuzzy msgid "We never show your email" msgstr "(nid ydym byth yn dangos eich cyfeiriad e-bost na'ch rhif ffôn)" #: templates/web/bromley/report/new/fill_in_details_form.html:133 #: templates/web/bromley/report/new/fill_in_details_form.html:179 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:130 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:190 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:144 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:211 +#: templates/web/zurich/report/new/fill_in_details_form.html:114 #, fuzzy msgid "We never show your email address or phone number." msgstr "(nid ydym byth yn dangos eich cyfeiriad e-bost na'ch rhif ffôn)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:349 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:351 msgid "" "We realise this empty property might be the responsibility of %s; however, " "we don't currently have any contact details for them. If you know of an " "appropriate contact address, please do get in touch." msgstr "" -#: templates/web/default/index.html:34 templates/web/emptyhomes/index.html:59 -#: templates/web/fixmystreet/index.html:45 +#: templates/web/default/index-steps.html:16 +#: templates/web/emptyhomes/index.html:59 msgid "" "The details will be sent directly to the right person in the local council " "for them to take action" @@ -3825,6 +3919,7 @@ msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:217 #: templates/web/default/report/new/notes.html:5 +#: templates/web/fixmybarangay/report/new/notes.html:5 msgid "" "We will only use your personal information in accordance with our <a href=\"/" "faq#privacy\">privacy policy.</a>" @@ -3856,8 +3951,8 @@ msgstr "" "Byddai'n dda gennym glywed eich barn am y wefan hon. Llenwch y ffurflen, neu " "anfonwch neges e-bost at <a href='mailto:%s'>%s</a>:" -#: templates/web/default/admin/council_contacts.html:41 -#: templates/web/default/admin/council_edit.html:41 +#: templates/web/default/admin/council_contacts.html:45 +#: templates/web/default/admin/council_edit.html:69 msgid "When edited" msgstr "" @@ -3866,7 +3961,7 @@ msgstr "" msgid "When sent" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:612 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:611 msgid "Whole block of empty flats" msgstr "Bloc cyfan o fflatiau gwag" @@ -3878,6 +3973,7 @@ msgid "" msgstr "" #: templates/web/fixmystreet/footer.html:22 +#: templates/web/stevenage/footer.html:22 msgid "" "Would you like better integration with reportemptyhomes.com? <a href=" "\"http://www.mysociety.org/for-councils/fixmystreet/\">Find out about " @@ -3885,6 +3981,7 @@ msgid "" msgstr "" #: templates/web/fixmystreet/footer.html:18 +#: templates/web/stevenage/footer.html:18 msgid "" "Would you like to contribute to reportemptyhomes.com? Our code is open " "source and <a href=\"http://github.com/mysociety/fixmystreet\">available on " @@ -3899,6 +3996,7 @@ msgid "" msgstr "" #: templates/web/default/report/new/notes.html:8 +#: templates/web/fixmybarangay/report/new/notes.html:8 #: templates/web/fixmystreet/report/new/notes.html:7 msgid "" "Writing your message entirely in block capitals makes it hard to read, as " @@ -3909,8 +4007,9 @@ msgstr "" msgid "Year" msgstr "" -#: templates/web/default/admin/council_contacts.html:48 -#: templates/web/default/admin/council_contacts.html:49 +#: templates/web/default/admin/council_contacts.html:52 +#: templates/web/default/admin/council_contacts.html:53 +#: templates/web/default/admin/council_contacts.html:54 #: templates/web/default/admin/council_edit.html:5 #: templates/web/default/admin/list_updates.html:30 #: templates/web/default/admin/list_updates.html:31 @@ -3930,8 +4029,8 @@ msgstr "Ydw" #: templates/web/bromley/report/display.html:155 #: templates/web/bromley/report/new/fill_in_details_form.html:198 -#: templates/web/fixmystreet/report/display.html:133 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:156 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:171 +#: templates/web/fixmystreet/report/update-form.html:87 #, fuzzy msgid "Yes I have a password" msgstr "Adrodd am eiddo gwag a gweld y rhain" @@ -3952,7 +4051,7 @@ msgid "" "personal information, or similar:" msgstr "" -#: templates/web/emptyhomes/reports/council.html:64 +#: templates/web/emptyhomes/reports/body.html:64 #, fuzzy msgid "" "You can <a href=\"%s\">view all reports for the council</a> or <a href=\"/" @@ -3961,7 +4060,7 @@ msgstr "" "Gallwch <a href=\"%s\">weld llai o fanylion</a> neu fynd yn ôl a <a href=\"/" "reports\">dangos pob cyngor</a>." -#: templates/web/emptyhomes/reports/council.html:66 +#: templates/web/emptyhomes/reports/body.html:66 #, fuzzy msgid "You can <a href=\"/reports\">show all councils</a>." msgstr "Gallwch <a href=\"%s\">weld mwy o fanylion</a>." @@ -3989,27 +4088,30 @@ msgstr "" #: templates/web/default/questionnaire/index.html:92 #: templates/web/default/report/new/fill_in_details_form.html:93 #: templates/web/fixmystreet/questionnaire/index.html:87 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:101 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:99 +#: templates/web/zurich/report/new/fill_in_details_form.html:93 msgid "" "You have already attached a photo to this report, attaching another one will " "replace it." msgstr "" #: templates/web/bromley/report/display.html:106 -#: templates/web/default/report/display.html:106 -#: templates/web/fixmystreet/report/display.html:100 +#: templates/web/default/report/update-form.html:57 +#: templates/web/fixmystreet/report/update-form.html:54 msgid "" "You have already attached a photo to this update, attaching another one will " "replace it." msgstr "" #: templates/web/default/auth/sign_out.html:3 +#: templates/web/fixmybarangay/auth/sign_out.html:3 msgid "You have been signed out" msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:25 #: templates/web/default/report/new/fill_in_details_form.html:7 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:27 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:28 +#: templates/web/zurich/report/new/fill_in_details_form.html:28 #, fuzzy msgid "" "You have located the empty property at the point marked with a green pin on " @@ -4046,8 +4148,8 @@ msgstr "Rydych wedi dileu'ch hysbysiad yn llwyddiannus." msgid "You have successfully deleted your alert." msgstr "Rydych wedi dileu'ch hysbysiad yn llwyddiannus." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:740 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:136 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:743 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:140 #, fuzzy msgid "" "You have successfully signed in; please check and confirm your details are " @@ -4079,16 +4181,18 @@ msgstr "Adroddiadau" #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 #: templates/web/fixmystreet/contact/index.html:72 -#: templates/web/fixmystreet/report/display.html:34 -#: templates/web/fixmystreet/report/display.html:36 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:142 +#: templates/web/fixmystreet/report/display.html:53 +#: templates/web/fixmystreet/report/display.html:55 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:115 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:157 +#: templates/web/zurich/report/new/fill_in_details_form.html:106 #, fuzzy msgid "Your email" msgstr "Eich cyfeiriad e-bost:" #: templates/web/bromley/report/display.html:130 #: templates/web/fixmystreet/auth/general.html:26 -#: templates/web/fixmystreet/report/display.html:124 +#: templates/web/fixmystreet/report/update-form.html:78 #, fuzzy msgid "Your email address" msgstr "Eich cyfeiriad e-bost:" @@ -4099,8 +4203,9 @@ msgid "Your email address:" msgstr "Eich cyfeiriad e-bost:" #: templates/web/default/alert/_list.html:92 -#: templates/web/default/report/display.html:128 #: templates/web/default/report/new/fill_in_details_form.html:124 +#: templates/web/default/report/update-form.html:79 +#: templates/web/fixmybarangay/alert/_list.html:37 msgid "Your email:" msgstr "Eich cyfeiriad e-bost:" @@ -4124,27 +4229,28 @@ msgstr "" msgid "Your last name" msgstr "Eich enw:" -#: templates/web/fixmystreet/auth/general.html:53 +#: templates/web/fixmystreet/auth/general.html:57 #: templates/web/fixmystreet/contact/index.html:65 -#: templates/web/fixmystreet/report/display.html:181 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:121 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:181 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:124 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:202 +#: templates/web/fixmystreet/report/update-form.html:138 +#: templates/web/zurich/report/new/fill_in_details_form.html:122 #, fuzzy msgid "Your name" msgstr "Eich enw:" #: templates/web/default/auth/general.html:59 #: templates/web/default/contact/index.html:68 -#: templates/web/default/report/display.html:202 #: templates/web/default/report/new/fill_in_details_form.html:203 +#: templates/web/default/report/update-form.html:149 msgid "Your name:" msgstr "Eich enw:" #: templates/web/bromley/report/display.html:160 #: templates/web/bromley/report/new/fill_in_details_form.html:203 -#: templates/web/fixmystreet/auth/general.html:37 -#: templates/web/fixmystreet/report/display.html:138 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:161 +#: templates/web/fixmystreet/auth/general.html:41 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:176 +#: templates/web/fixmystreet/report/update-form.html:92 #, fuzzy msgid "Your password" msgstr "Adroddiadau" @@ -4155,8 +4261,9 @@ msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:137 #: templates/web/bromley/report/new/fill_in_details_form.html:184 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:134 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:195 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:149 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:216 +#: templates/web/zurich/report/new/fill_in_details_form.html:125 msgid "Your phone number" msgstr "" @@ -4170,12 +4277,12 @@ msgstr "Adroddiadau" #: templates/web/fiksgatami/footer.html:6 #: templates/web/fiksgatami/nn/footer.html:6 #: templates/web/fixmystreet/footer.html:47 -#: templates/web/reading/footer.html:7 +#: templates/web/reading/footer.html:7 templates/web/stevenage/footer.html:41 #, fuzzy msgid "Your reports" msgstr "Adroddiadau" -#: templates/web/default/my/my.html:45 templates/web/fixmystreet/my/my.html:45 +#: templates/web/default/my/my.html:45 templates/web/fixmystreet/my/my.html:49 #, fuzzy msgid "Your updates" msgstr "Adroddiadau" @@ -4188,19 +4295,23 @@ msgstr "Eich cyfeiriad e-bost:" msgid "by %s" msgstr "" -#: templates/web/default/reports/council.html:12 -#: templates/web/default/reports/council.html:13 -#: templates/web/emptyhomes/reports/council.html:6 -#: templates/web/emptyhomes/reports/council.html:7 +#: templates/web/default/reports/body.html:12 +#: templates/web/default/reports/body.html:13 +#: templates/web/emptyhomes/reports/body.html:6 +#: templates/web/emptyhomes/reports/body.html:7 msgid "council" msgstr "cyngor" +#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +msgid "council ref: %s" +msgstr "" + #: templates/web/default/admin/report_edit.html:15 msgid "didn't use map" msgstr "" #: templates/web/default/alert/index.html:33 -#: templates/web/fixmystreet/around/postcode_form.html:17 +#: templates/web/fixmystreet/around/postcode_form.html:20 msgid "e.g. ‘%s’ or ‘%s’" msgstr "" @@ -4208,7 +4319,7 @@ msgstr "" msgid "from %d different users" msgstr "" -#: perllib/Utils.pm:289 +#: perllib/Utils.pm:267 msgid "less than a minute" msgstr "llai na munud" @@ -4220,17 +4331,22 @@ msgstr "" msgid "marked as returned to use" msgstr "cofnodwyd bod hyn wedi'i adfer i'w ddefnyddio" -#: perllib/FixMyStreet/App/Controller/Admin.pm:112 +#: perllib/FixMyStreet/App/Controller/Admin.pm:113 #: templates/web/default/admin/questionnaire.html:15 #: templates/web/default/admin/questionnaire.html:16 msgid "n/a" msgstr "" #: templates/web/default/alert/_list.html:87 +#: templates/web/fixmybarangay/alert/_list.html:32 #: templates/web/fixmystreet/alert/_list.html:85 msgid "or" msgstr "neu" +#: templates/web/default/js/validation_strings.html:21 +msgid "or locate me automatically" +msgstr "" + #: templates/web/default/admin/report_edit.html:15 msgid "originally entered" msgstr "" @@ -4245,9 +4361,9 @@ msgstr "wedi'i ailagor" #: templates/web/barnet/header.html:71 templates/web/bromley/header.html:100 #: templates/web/bromley/header.html:65 -#: templates/web/fixmybarangay/header.html.orig:43 -#: templates/web/fixmystreet/header.html:48 -#: templates/web/zurich/header.html:48 +#: templates/web/fixmybarangay/header.html:65 +#: templates/web/fixmystreet/header.html:50 +#: templates/web/stevenage/header.html:98 templates/web/zurich/header.html:48 msgid "sign out" msgstr "" @@ -4257,25 +4373,22 @@ msgstr "" #: templates/web/default/report/new/fill_in_details_form.html:14 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:6 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:9 +#: templates/web/zurich/report/new/fill_in_details_form.html:6 +#: templates/web/zurich/report/new/fill_in_details_form.html:9 #, fuzzy msgid "the local council" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" -#: perllib/FixMyStreet/DB/Result/Problem.pm:541 -msgid "the map was not used so pin location may be inaccurate" +#: templates/web/default/report/_main.html:6 +msgid "there is no pin shown as the user did not use the map" msgstr "" -"ni ddefnyddiwyd y map felly mae'n bosibl na fydd lleoliad y pin yn gywir" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 -msgid "their ref: %s" -msgstr "" - -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:330 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:332 #, fuzzy msgid "this type of local empty property" msgstr "Anfonwch fanylion eiddo gwag lleol newydd ataf i drwy'r e-bost" -#: perllib/Utils.pm:263 +#: perllib/Utils.pm:241 msgid "today" msgstr "heddiw" @@ -4292,10 +4405,10 @@ msgstr "" msgid "user is empty property owner" msgstr "Adroddiadau hŷn o eiddo gwag" -#: templates/web/default/reports/council.html:0 -#: templates/web/default/reports/council.html:9 -#: templates/web/emptyhomes/reports/council.html:0 -#: templates/web/emptyhomes/reports/council.html:3 +#: templates/web/default/reports/body.html:0 +#: templates/web/default/reports/body.html:9 +#: templates/web/emptyhomes/reports/body.html:0 +#: templates/web/emptyhomes/reports/body.html:3 msgid "ward" msgstr "" @@ -4332,6 +4445,34 @@ msgstr "ni fydd eich eiddo gwag yn cael ei bostio" msgid "your update will not be posted" msgstr "ni fydd eich diweddariad yn cael ei bostio" +#: templates/web/emptyhomes/front/stats.html:17 +#, perl-format +msgid "<big>%s</big> report recently" +msgid_plural "<big>%s</big> reports recently" +msgstr[0] "<big>%s</big> adroddiad yn ddiweddar" +msgstr[1] "<big>%s</big> o adroddiadau yn ddiweddar" + +#: perllib/Utils.pm:286 +#, fuzzy, perl-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "awr" +msgstr[1] "awr" + +#: perllib/Utils.pm:288 +#, fuzzy, perl-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "munud" +msgstr[1] "munud" + +#: templates/web/default/front/stats.html:29 +#, perl-format +msgid "<big>%s</big> update on reports" +msgid_plural "<big>%s</big> updates on reports" +msgstr[0] "<big>%s</big> diweddariad ar adroddiadau" +msgstr[1] "<big>%s</big> diweddariad ar adroddiadau" + #: templates/web/emptyhomes/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." @@ -4340,12 +4481,12 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: templates/web/emptyhomes/front/stats.html:17 -#, perl-format -msgid "<big>%s</big> report recently" -msgid_plural "<big>%s</big> reports recently" -msgstr[0] "<big>%s</big> adroddiad yn ddiweddar" -msgstr[1] "<big>%s</big> o adroddiadau yn ddiweddar" +#: perllib/Utils.pm:282 +#, fuzzy, perl-format +msgid "%d week" +msgid_plural "%d weeks" +msgstr[0] "wythnos" +msgstr[1] "wythnos" #: templates/web/emptyhomes/front/stats.html:12 #, perl-format @@ -4372,12 +4513,40 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: templates/web/default/front/stats.html:29 -#, perl-format -msgid "<big>%s</big> update on reports" -msgid_plural "<big>%s</big> updates on reports" -msgstr[0] "<big>%s</big> diweddariad ar adroddiadau" -msgstr[1] "<big>%s</big> diweddariad ar adroddiadau" +#: perllib/Utils.pm:284 +#, fuzzy, perl-format +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "diwrnod" +msgstr[1] "diwrnod" + +#, fuzzy +#~ msgid "reportemptyhomes.com administration" +#~ msgstr "Diweddariadau i reportemptyhomes.com" + +#, fuzzy +#~ msgid "Search Abuse" +#~ msgstr "Adroddiadau cryno" + +#, fuzzy +#~ msgid "%d days" +#~ msgstr "diwrnod" + +#, fuzzy +#~ msgid "%d hours" +#~ msgstr "awr" + +#, fuzzy +#~ msgid "%d minutes" +#~ msgstr "munud" + +#, fuzzy +#~ msgid "%d weeks" +#~ msgstr "wythnos" + +#~ msgid "the map was not used so pin location may be inaccurate" +#~ msgstr "" +#~ "ni ddefnyddiwyd y map felly mae'n bosibl na fydd lleoliad y pin yn gywir" #, fuzzy #~ msgid "reportemptyhomes.com for Councils" diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po index 32ee690a6..024e86f26 100644 --- a/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2012-10-24 11:20+0100\n" -"PO-Revision-Date: 2012-08-21 14:03+0100\n" +"POT-Creation-Date: 2012-12-10 13:18+0000\n" +"PO-Revision-Date: 2012-11-20 17:17+0100\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <team@fixmystreet.com>\n" "Language: \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:563 +#: perllib/FixMyStreet/DB/Result/Problem.pm:560 #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:339 msgid " and " msgstr "und" @@ -62,18 +62,18 @@ msgstr "" msgid "%d questionnaires sent – %d answered (%s%%)" msgstr "" -#: templates/web/fixmystreet/report/_support.html:3 +#: templates/web/default/report/_support.html:3 msgid "%d supporters" msgstr "" -#: templates/web/default/reports/council.html:0 -#: templates/web/default/reports/council.html:26 -#: templates/web/emptyhomes/reports/council.html:11 -#: templates/web/emptyhomes/reports/council.html:13 +#: templates/web/default/reports/body.html:0 +#: templates/web/default/reports/body.html:26 +#: templates/web/emptyhomes/reports/body.html:11 +#: templates/web/emptyhomes/reports/body.html:13 msgid "%s - Summary reports" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:613 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "%s ref: %s" msgstr "" @@ -83,7 +83,7 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:496 msgid "%s, reported anonymously at %s" -msgstr "%s anonym gemeldet um %s" +msgstr "%s, gemeldet um %s" #: perllib/FixMyStreet/DB/Result/Problem.pm:498 msgid "%s, reported by %s at %s" @@ -98,6 +98,7 @@ msgid "(Don't worry — %s)" msgstr "" #: templates/web/default/admin/report_blocks.html:11 +#: templates/web/default/admin/search_users.html:23 msgid "(Email in abuse table)" msgstr "" @@ -125,7 +126,7 @@ msgid "(fixed)" msgstr "(gelöst)" #: templates/web/default/index.html:12 templates/web/default/index.html:8 -#: templates/web/fixmystreet/around/postcode_form.html:10 +#: templates/web/fixmystreet/around/intro.html:2 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(z.B. illegale Deponien, Strassenschäden, Graffitis usw.)" @@ -135,6 +136,7 @@ msgid "(not sent to council)" msgstr "" #: templates/web/default/report/new/fill_in_details_form.html:217 +#: templates/web/zurich/report/new/fill_in_details_form.html:118 msgid "(optional)" msgstr "(optional)" @@ -145,23 +147,23 @@ msgstr "" #: templates/web/default/report/new/fill_in_details_form.html:211 msgid "(we never show your email address or phone number)" -msgstr "(ihre eMail-Adresse oder Telefonnummer werden nie angezeigt)" +msgstr "(ihre E-Mail Adresse und Telefonnummer werden nie angezeigt)" -#: templates/web/default/report/display.html:209 +#: templates/web/default/report/update-form.html:156 msgid "(we never show your email)" -msgstr "(ihre eMail-Adresse wird nie angezeigt)" +msgstr "(ihre E-Mail Adresse wird nie angezeigt)" #: perllib/FixMyStreet/App/Controller/Admin.pm:285 msgid "*unknown*" msgstr "*unbekannt*" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:630 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:628 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:656 #: perllib/FixMyStreet/DB/Result/Problem.pm:353 msgid "-- Pick a category --" msgstr "-- Wählen Sie eine Kategorie --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:610 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:608 #: perllib/FixMyStreet/DB/Result/Problem.pm:359 msgid "-- Pick a property type --" msgstr "" @@ -174,7 +176,7 @@ msgstr "" "Danke &mdash; Sie können Ihre aktualisierte Meldung <a href=\"%s" "\">auf der Webseite anschauen</a>" -#: templates/web/fixmystreet/report/_support.html:3 +#: templates/web/default/report/_support.html:3 msgid "1 supporter" msgstr "" @@ -195,7 +197,7 @@ msgid "" "</p>" msgstr "" -#: templates/web/fixmystreet/questionnaire/completed-open.html:1 +#: templates/web/fixmystreet/questionnaire/completed-open.html:6 msgid "" "<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" "suggestions: why not try <a href=\"http://www.writetothem.com/\">writing " @@ -207,7 +209,7 @@ msgid "" "</p>" msgstr "" -#: templates/web/default/questionnaire/completed-open.html:1 +#: templates/web/default/questionnaire/completed-open.html:6 msgid "" "<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" "suggestions: why not try writing to your local representative or, if " @@ -268,18 +270,18 @@ msgid "" "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this " "step</a>.</small>" msgstr "" -"Karte nicht sichtbar? <a href='%s' rel='nofollow'>Überspringen Sie " -"diesen Schritt</a>.</small>" +"Karte nicht sichtbar? <a href='%s' rel='nofollow'>Überspringen</a>.</" +"small>" #: templates/web/default/admin/index.html:14 msgid "<strong>%d</strong> live problems" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:182 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:193 msgid "<strong>No</strong> Let me confirm my report by email" -msgstr "Meldung per eMail bestätigen" +msgstr "Meldung per E-Mail bestätigen" -#: templates/web/fixmystreet/report/display.html:170 +#: templates/web/fixmystreet/report/update-form.html:108 msgid "<strong>No</strong> Let me confirm my update by email" msgstr "" @@ -295,17 +297,17 @@ msgstr "" msgid "<strong>No</strong>, let me confirm my report by email:" msgstr "" -#: templates/web/default/report/display.html:164 +#: templates/web/default/report/update-form.html:115 msgid "<strong>No</strong>, let me confirm my update by email:" msgstr "" #: templates/web/default/auth/general.html:37 -#: templates/web/default/report/display.html:142 #: templates/web/default/report/new/fill_in_details_form.html:140 +#: templates/web/default/report/update-form.html:93 #: templates/web/fixmystreet/auth/general.html:36 #: templates/web/fixmystreet/auth/general.html:38 -#: templates/web/fixmystreet/report/display.html:147 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:158 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:169 +#: templates/web/fixmystreet/report/update-form.html:85 msgid "<strong>Yes</strong> I have a password" msgstr "" @@ -338,12 +340,13 @@ msgid "Alert %d disabled (created %s)" msgstr "" #: templates/web/bromley/report/display.html:207 -#: templates/web/default/report/display.html:214 -#: templates/web/fixmystreet/report/display.html:211 +#: templates/web/default/report/update-form.html:161 +#: templates/web/fixmystreet/report/update-form.html:146 msgid "Alert me to future updates" msgstr "" #: templates/web/default/reports/index.html:3 +#: templates/web/fixmybarangay/reports/index.html:3 msgid "All Reports" msgstr "Alle Meldungen" @@ -357,7 +360,8 @@ msgstr "Alle bestätigten" #: templates/web/fiksgatami/nn/footer.html:7 #: templates/web/fixmybarangay/footer.html:20 #: templates/web/fixmystreet/footer.html:49 -#: templates/web/reading/footer.html:8 +#: templates/web/reading/footer.html:8 templates/web/stevenage/footer.html:43 +#: templates/web/zurich/footer.html:12 msgid "All reports" msgstr "Alle Meldungen" @@ -393,6 +397,8 @@ msgstr "" #: templates/web/default/report/new/fill_in_details_form.html:13 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:6 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:8 +#: templates/web/zurich/report/new/fill_in_details_form.html:6 +#: templates/web/zurich/report/new/fill_in_details_form.html:8 msgid "" "All the information you provide here will be sent to <strong>%s</strong>." msgstr "" @@ -428,10 +434,12 @@ msgid "" msgstr "" #: templates/web/fixmystreet/footer.html:17 +#: templates/web/stevenage/footer.html:17 msgid "Are you a developer?" msgstr "" #: templates/web/fixmystreet/footer.html:21 +#: templates/web/stevenage/footer.html:21 msgid "Are you from a council?" msgstr "" @@ -456,6 +464,10 @@ msgid "" "whom the report is sent." msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1032 +msgid "Bodies" +msgstr "" + #: templates/web/fiksgatami/footer.html:16 #: templates/web/fiksgatami/nn/footer.html:16 msgid "" @@ -474,14 +486,15 @@ msgstr "" "Karte nicht sichtbar? <a href='%s' rel='nofollow'>Überspringen Sie " "diesen Schritt</a>" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:660 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:631 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: templates/web/bromley/report/new/fill_in_details_form.html:68 #: templates/web/default/admin/council_contacts.html:37 #: templates/web/default/admin/index.html:36 #: templates/web/default/admin/list_flagged.html:14 #: templates/web/default/admin/search_reports.html:17 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:74 +#: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Category" msgstr "Kategorie" @@ -506,9 +519,10 @@ msgstr "Kategorie: %s" msgid "Change Password" msgstr "Passwort ändern" +#: templates/web/default/js/validation_strings.html:22 #: templates/web/fixmystreet/around/_report_banner.html:2 msgid "Click map to report a problem" -msgstr "Klicken Sie in die Karte um eine Meldung zu erfassen" +msgstr "Mangel lokalisieren" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:82 @@ -516,15 +530,15 @@ msgstr "Klicken Sie in die Karte um eine Meldung zu erfassen" #: templates/web/default/admin/report_edit.html:20 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/dashboard/index.html:140 -#: templates/web/default/report/display.html:79 -#: templates/web/default/report/display.html:81 +#: templates/web/default/report/update-form.html:30 +#: templates/web/default/report/update-form.html:32 #: templates/web/fixmystreet/report/banner.html:15 -#: templates/web/fixmystreet/report/display.html:90 -#: templates/web/fixmystreet/report/display.html:92 +#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/fixmystreet/report/update-form.html:30 msgid "Closed" msgstr "Geschlossen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:698 +#: perllib/FixMyStreet/DB/Result/Problem.pm:695 msgid "Closed by council" msgstr "" @@ -589,8 +603,8 @@ msgstr "Bestätigen" msgid "Confirm account" msgstr "" -#: templates/web/fixmystreet/report/display.html:165 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:176 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:187 +#: templates/web/fixmystreet/report/update-form.html:103 msgid "" "Confirm by email below, providing a new password at that point. When you " "confirm, your password will be updated." @@ -603,6 +617,8 @@ msgstr "" #: templates/web/default/tokens/confirm_update.html:3 #: templates/web/emptyhomes/tokens/confirm_problem.html:1 #: templates/web/emptyhomes/tokens/confirm_problem.html:3 +#: templates/web/southampton/tokens/confirm_problem.html:1 +#: templates/web/southampton/tokens/confirm_problem.html:3 msgid "Confirmation" msgstr "Bestätigung" @@ -647,8 +663,8 @@ msgstr "" msgid "Contact the team" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1164 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1159 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1187 msgid "Could not find user" msgstr "" @@ -659,7 +675,6 @@ msgstr "" msgid "Council" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 #: templates/web/default/admin/council_list.html:1 msgid "Council contacts" msgstr "" @@ -724,6 +739,7 @@ msgstr "Gelöscht" #: templates/web/bromley/report/new/fill_in_details_form.html:54 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 +#: templates/web/zurich/report/new/fill_in_details_form.html:60 msgid "Details" msgstr "Beschreibung" @@ -746,8 +762,8 @@ msgstr "" #: templates/web/default/auth/general.html:32 #: templates/web/fixmystreet/auth/general.html:32 -#: templates/web/fixmystreet/report/display.html:144 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:154 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:165 +#: templates/web/fixmystreet/report/update-form.html:82 msgid "Do you have a FixMyStreet password?" msgstr "" @@ -784,19 +800,18 @@ msgstr "" #: templates/web/default/admin/list_flagged.html:12 #: templates/web/default/admin/list_flagged.html:35 #: templates/web/default/admin/list_updates.html:8 -#: templates/web/default/admin/search_abuse.html:11 #: templates/web/default/admin/search_reports.html:15 #: templates/web/default/admin/search_users.html:13 #: templates/web/fixmystreet/auth/general.html:20 -#: templates/web/fixmystreet/report/display.html:136 +#: templates/web/fixmystreet/report/update-form.html:74 msgid "Email" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1140 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1135 msgid "Email added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1132 msgid "Email already in abuse list" msgstr "" @@ -818,15 +833,15 @@ msgstr "Schicken sie mir Aktualisierungen" msgid "Email:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:612 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:610 msgid "Empty flat or maisonette" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:611 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:609 msgid "Empty house or bungalow" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:614 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:612 msgid "Empty office or other commercial" msgstr "" @@ -834,11 +849,11 @@ msgstr "" msgid "Empty property details form" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:615 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:613 msgid "Empty pub or bar" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:616 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:614 msgid "Empty public building - school, hospital, etc." msgstr "" @@ -854,10 +869,14 @@ msgstr "" msgid "End month:" msgstr "" +#: perllib/FixMyStreet/Cobrand/Zurich.pm:9 +msgid "Enter a Zürich street name" +msgstr "Ungefähre Adresse des Mangels" + #: templates/web/emptyhomes/index.html:40 #: templates/web/emptyhomes/index.html:41 msgid "Enter a nearby GB postcode, or street name and area" -msgstr "Geben Sie eine Adresse an" +msgstr "Geben Sie die ungefähre Adresse des Mangels an" #: perllib/FixMyStreet/Cobrand/UK.pm:18 #, fuzzy @@ -866,34 +885,33 @@ msgstr "Geben Sie eine Adresse an" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:25 msgid "Enter a nearby postcode, or street name and area" -msgstr "Geben Sie eine Adresse an" +msgstr "Ungefähre Adresse des Mangels" #: templates/web/default/around/postcode_form.html:1 #: templates/web/default/around/postcode_form.html:2 -#: templates/web/fixmystreet/around/postcode_form.html:13 -#: templates/web/fixmystreet/around/postcode_form.html:14 -#, fuzzy +#: templates/web/fixmystreet/around/postcode_form.html:10 +#: templates/web/fixmystreet/around/postcode_form.html:11 msgid "Enter a nearby street name and area" -msgstr "Geben Sie eine Adresse an" +msgstr "Ungefähre Adresse des Mangels" #: templates/web/default/auth/general.html:64 -#: templates/web/default/report/display.html:171 #: templates/web/default/report/new/fill_in_details_form.html:169 +#: templates/web/default/report/update-form.html:122 msgid "Enter a new password:" msgstr "" #: templates/web/bromley/report/display.html:148 #: templates/web/bromley/report/new/fill_in_details_form.html:189 #: templates/web/fixmystreet/auth/general.html:61 -#: templates/web/fixmystreet/report/display.html:182 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:210 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:221 +#: templates/web/fixmystreet/report/update-form.html:120 msgid "Enter a password" msgstr "" -#: templates/web/default/index.html:33 templates/web/emptyhomes/index.html:58 -#: templates/web/fixmystreet/index.html:46 +#: templates/web/default/index-steps.html:11 +#: templates/web/emptyhomes/index.html:58 msgid "Enter details of the problem" -msgstr "Beschreiben sie den Mangel" +msgstr "Beschreiben Sie den Mangel" #: templates/web/default/auth/token.html:5 #: templates/web/default/errors/generic.html:1 @@ -945,14 +963,10 @@ msgstr "" msgid "FixMyStreet" msgstr "" -#: templates/web/default/admin/header.html:13 +#: templates/web/default/admin/header.html:10 msgid "FixMyStreet admin:" msgstr "" -#: templates/web/default/admin/header.html:3 -msgid "FixMyStreet administration" -msgstr "" - #: templates/web/default/alert/index.html:11 msgid "" "FixMyStreet has a variety of RSS feeds and email alerts for local problems, " @@ -984,11 +998,11 @@ msgstr "" #: templates/web/default/admin/report_edit.html:20 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/dashboard/index.html:140 -#: templates/web/default/report/display.html:79 -#: templates/web/default/report/display.html:81 +#: templates/web/default/report/update-form.html:30 +#: templates/web/default/report/update-form.html:32 #: templates/web/fixmystreet/report/banner.html:12 -#: templates/web/fixmystreet/report/display.html:90 -#: templates/web/fixmystreet/report/display.html:92 +#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/fixmystreet/report/update-form.html:30 msgid "Fixed" msgstr "Gelöst" @@ -1014,6 +1028,7 @@ msgstr "" msgid "Flag user" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1037 #: templates/web/default/admin/search_users.html:15 msgid "Flagged" msgstr "" @@ -1024,7 +1039,7 @@ msgid "Flagged:" msgstr "" #: templates/web/default/reports/_ward-list.html:3 -#: templates/web/emptyhomes/reports/council.html:19 +#: templates/web/emptyhomes/reports/body.html:19 #: templates/web/fixmystreet/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "" @@ -1033,8 +1048,8 @@ msgstr "" msgid "For council(s):" msgstr "" -#: templates/web/fixmystreet/report/display.html:164 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:175 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:186 +#: templates/web/fixmystreet/report/update-form.html:102 #, fuzzy msgid "Forgotten your password?" msgstr "Ihr Passwort" @@ -1060,15 +1075,14 @@ msgid "GeoRSS on Google Maps" msgstr "" #: templates/web/bromley/report/display.html:30 -#: templates/web/fixmystreet/report/display.html:27 +#: templates/web/fixmystreet/report/display.html:31 msgid "Get updates" msgstr "" #: templates/web/fixmystreet/reports/_rss.html:3 #: templates/web/fixmystreet/reports/_rss.html:9 -#, fuzzy msgid "Get updates of %s problems" -msgstr "Beschreiben sie den Mangel" +msgstr "Beschreiben Sie den Mangel" #: templates/web/fixmystreet/reports/_rss.html:11 #: templates/web/fixmystreet/reports/_rss.html:3 @@ -1084,7 +1098,7 @@ msgstr "" #: templates/web/default/alert/index.html:34 #: templates/web/default/around/postcode_form.html:8 #: templates/web/emptyhomes/index.html:47 -#: templates/web/fixmystreet/around/postcode_form.html:24 +#: templates/web/fixmystreet/around/postcode_form.html:21 msgid "Go" msgstr "Los" @@ -1120,7 +1134,8 @@ msgstr "" #: templates/web/fiksgatami/nn/footer.html:9 #: templates/web/fixmybarangay/footer.html:24 #: templates/web/fixmystreet/footer.html:53 -#: templates/web/reading/footer.html:10 +#: templates/web/reading/footer.html:10 templates/web/stevenage/footer.html:47 +#: templates/web/zurich/footer.html:14 msgid "Help" msgstr "Hilfe" @@ -1131,9 +1146,9 @@ msgstr "" #: templates/web/barnet/header.html:70 templates/web/bromley/header.html:64 #: templates/web/bromley/header.html:99 -#: templates/web/fixmybarangay/header.html:66 -#: templates/web/fixmystreet/header.html:47 -#: templates/web/zurich/header.html:47 +#: templates/web/fixmybarangay/header.html:64 +#: templates/web/fixmystreet/header.html:49 +#: templates/web/stevenage/header.html:97 templates/web/zurich/header.html:47 msgid "Hi %s" msgstr "Hallo %s" @@ -1155,8 +1170,8 @@ msgstr "Stecknadeln ausblenden" msgid "History" msgstr "History" -#: templates/web/default/index.html:28 templates/web/emptyhomes/index.html:53 -#: templates/web/fixmystreet/index.html:36 +#: templates/web/default/index-steps.html:1 +#: templates/web/emptyhomes/index.html:53 msgid "How to report a problem" msgstr "Erfasse eine neue Meldung:" @@ -1233,10 +1248,10 @@ msgstr "" #: templates/web/default/admin/report_edit.html:20 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/dashboard/index.html:140 -#: templates/web/default/report/display.html:79 -#: templates/web/default/report/display.html:81 -#: templates/web/fixmystreet/report/display.html:90 -#: templates/web/fixmystreet/report/display.html:92 +#: templates/web/default/report/update-form.html:30 +#: templates/web/default/report/update-form.html:32 +#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/fixmystreet/report/update-form.html:30 msgid "In Progress" msgstr "In Bearbeitung" @@ -1264,7 +1279,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: perllib/FixMyStreet/App/Controller/Admin.pm:952 msgid "Invalid end date" msgstr "Ung&ultiges Enddatum" @@ -1272,7 +1287,7 @@ msgstr "Ung&ultiges Enddatum" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:946 +#: perllib/FixMyStreet/App/Controller/Admin.pm:942 msgid "Invalid start date" msgstr "Ung&ultiges Startdatum" @@ -1282,10 +1297,10 @@ msgstr "Ung&ultiges Startdatum" #: templates/web/default/admin/report_edit.html:19 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/dashboard/index.html:139 -#: templates/web/default/report/display.html:79 -#: templates/web/default/report/display.html:80 -#: templates/web/fixmystreet/report/display.html:90 -#: templates/web/fixmystreet/report/display.html:91 +#: templates/web/default/report/update-form.html:30 +#: templates/web/default/report/update-form.html:31 +#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/fixmystreet/report/update-form.html:29 msgid "Investigating" msgstr "" @@ -1305,11 +1320,11 @@ msgstr "" #: templates/web/bromley/report/display.html:166 #: templates/web/bromley/report/new/fill_in_details_form.html:209 #: templates/web/default/auth/general.html:44 -#: templates/web/default/report/display.html:151 #: templates/web/default/report/new/fill_in_details_form.html:149 +#: templates/web/default/report/update-form.html:102 #: templates/web/fixmystreet/auth/general.html:46 -#: templates/web/fixmystreet/report/display.html:160 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:171 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:182 +#: templates/web/fixmystreet/report/update-form.html:98 msgid "Keep me signed in on this computer" msgstr "" @@ -1333,10 +1348,6 @@ msgstr "Letzte Bearbeitung" msgid "Last update:" msgstr "Letzte Bearbeitung" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 -msgid "List Flagged" -msgstr "" - #: templates/web/default/admin/council_contacts.html:16 #: templates/web/default/admin/council_contacts.html:18 msgid "List all reported problems" @@ -1345,6 +1356,7 @@ msgstr "Liste aller Meldungen" #: templates/web/bromley/report/new/fill_in_details_form.html:69 #: templates/web/default/report/new/fill_in_details_form.html:68 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:75 +#: templates/web/zurich/report/new/fill_in_details_form.html:69 msgid "Loading..." msgstr "" @@ -1378,14 +1390,14 @@ msgstr "" #: templates/web/fiksgatami/nn/footer.html:8 #: templates/web/fixmybarangay/footer.html:22 #: templates/web/fixmystreet/footer.html:51 -#: templates/web/reading/footer.html:9 +#: templates/web/reading/footer.html:9 templates/web/stevenage/footer.html:45 msgid "Local alerts" msgstr "RSS" -#: templates/web/default/index.html:32 templates/web/emptyhomes/index.html:57 -#: templates/web/fixmystreet/index.html:45 +#: templates/web/default/index-steps.html:10 +#: templates/web/emptyhomes/index.html:57 msgid "Locate the problem on a map of the area" -msgstr "Identifizieren Sie den Mangel auf der Karte" +msgstr "Lokalisieren Sie den Mangel auf der Karte" #: perllib/FixMyStreet/Map/OSM.pm:44 msgid "" @@ -1423,10 +1435,12 @@ msgstr "Meldungen in der Nähe" #: templates/web/emptyhomes/reports/index.html:10 #: templates/web/fiksgatami/nn/reports/index.html:9 #: templates/web/fiksgatami/reports/index.html:9 +#: templates/web/fixmybarangay/reports/index.html:19 #: templates/web/fixmystreet/auth/general.html:56 -#: templates/web/fixmystreet/report/display.html:199 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:119 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:186 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:120 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:197 +#: templates/web/fixmystreet/report/update-form.html:134 +#: templates/web/zurich/report/new/fill_in_details_form.html:118 msgid "Name" msgstr "Name" @@ -1442,7 +1456,7 @@ msgstr "Name:" msgid "Navigation" msgstr "Navigation" -#: perllib/FixMyStreet/Geocode/OSM.pm:161 +#: perllib/FixMyStreet/Geocode/OSM.pm:166 msgid "" "Nearest named road to the pin placed on the map (automatically generated " "using OpenStreetMap): %s%s" @@ -1454,8 +1468,8 @@ msgid "" "(%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:406 -#: perllib/FixMyStreet/Cobrand/Default.pm:446 +#: perllib/FixMyStreet/Cobrand/Default.pm:407 +#: perllib/FixMyStreet/Cobrand/Default.pm:447 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing " "Maps): %s" @@ -1473,6 +1487,7 @@ msgid "Nearly Done! Now check your email..." msgstr "Fast Fertig! Bitte checken Sie ihre Mailbox..." #: templates/web/default/reports/index.html:16 +#: templates/web/fixmybarangay/reports/index.html:20 msgid "New <br>problems" msgstr "Neue <br>Meldungen" @@ -1599,7 +1614,7 @@ msgstr "Keine Meldungen gefunden." msgid "No problems have been reported yet." msgstr "Bisher wurden noch keine Meldungen erfasst." -#: templates/web/fixmystreet/report/_support.html:3 +#: templates/web/default/report/_support.html:3 msgid "No supporters" msgstr "" @@ -1616,9 +1631,8 @@ msgstr "Keine" msgid "Not reported before" msgstr "" -#: templates/web/default/report/_main.html:11 +#: templates/web/default/report/_main.html:14 #: templates/web/emptyhomes/report/display.html:24 -#: templates/web/fixmystreet/report/_main.html:13 msgid "Not reported to council" msgstr "" @@ -1643,7 +1657,7 @@ msgstr "" msgid "Note: <strong>%s</strong>" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:153 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:164 msgid "Now to submit your report…" msgstr "" @@ -1651,11 +1665,11 @@ msgstr "" msgid "Now to submit your report… do you have a FixMyStreet password?" msgstr "" -#: templates/web/fixmystreet/report/display.html:143 +#: templates/web/fixmystreet/report/update-form.html:81 msgid "Now to submit your update…" msgstr "" -#: templates/web/default/report/display.html:133 +#: templates/web/default/report/update-form.html:84 msgid "Now to submit your update… do you have a FixMyStreet password?" msgstr "" @@ -1665,6 +1679,7 @@ msgid "Offensive? Unsuitable? Tell us" msgstr "" #: templates/web/default/reports/index.html:18 +#: templates/web/fixmybarangay/reports/index.html:22 msgid "Old / unknown <br>problems" msgstr "" @@ -1678,10 +1693,12 @@ msgid "Old state" msgstr "" #: templates/web/default/reports/index.html:20 +#: templates/web/fixmybarangay/reports/index.html:24 msgid "Older <br>fixed" msgstr "" #: templates/web/default/reports/index.html:17 +#: templates/web/fixmybarangay/reports/index.html:21 msgid "Older <br>problems" msgstr "" @@ -1701,8 +1718,8 @@ msgstr "" #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/update_edit.html:19 #: templates/web/default/dashboard/index.html:138 -#: templates/web/default/report/display.html:79 -#: templates/web/fixmystreet/report/display.html:90 +#: templates/web/default/report/update-form.html:30 +#: templates/web/fixmystreet/report/update-form.html:28 msgid "Open" msgstr "Öffnen" @@ -1734,9 +1751,9 @@ msgid "" "re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1008 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1006 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:656 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:657 #: perllib/FixMyStreet/DB/Result/Problem.pm:505 #: perllib/FixMyStreet/DB/Result/Problem.pm:515 #: perllib/FixMyStreet/DB/Result/Problem.pm:525 @@ -1769,8 +1786,8 @@ msgstr "" #: templates/web/bromley/report/display.html:145 #: templates/web/bromley/report/new/fill_in_details_form.html:186 #: templates/web/fixmystreet/auth/general.html:59 -#: templates/web/fixmystreet/report/display.html:179 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:207 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:218 +#: templates/web/fixmystreet/report/update-form.html:117 msgid "Password (optional)" msgstr "" @@ -1780,8 +1797,9 @@ msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:136 #: templates/web/bromley/report/new/fill_in_details_form.html:183 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:137 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:204 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:148 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:215 +#: templates/web/zurich/report/new/fill_in_details_form.html:124 msgid "Phone number (optional)" msgstr "Telefonnummer (optional)" @@ -1793,14 +1811,15 @@ msgstr "Telefonnummer:" #: templates/web/bromley/report/display.html:109 #: templates/web/bromley/report/new/fill_in_details_form.html:104 -#: templates/web/fixmystreet/report/display.html:119 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:110 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:92 +#: templates/web/fixmystreet/report/update-form.html:57 +#: templates/web/zurich/report/new/fill_in_details_form.html:86 msgid "Photo" msgstr "Foto" #: templates/web/default/questionnaire/index.html:95 -#: templates/web/default/report/display.html:109 #: templates/web/default/report/new/fill_in_details_form.html:102 +#: templates/web/default/report/update-form.html:60 #: templates/web/fixmystreet/questionnaire/index.html:90 msgid "Photo:" msgstr "Foto:" @@ -1815,10 +1834,10 @@ msgstr "Fotos von neuen Meldungen in der Nähe" #: templates/web/default/admin/report_edit.html:19 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/dashboard/index.html:139 -#: templates/web/default/report/display.html:79 -#: templates/web/default/report/display.html:80 -#: templates/web/fixmystreet/report/display.html:90 -#: templates/web/fixmystreet/report/display.html:91 +#: templates/web/default/report/update-form.html:30 +#: templates/web/default/report/update-form.html:31 +#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/fixmystreet/report/update-form.html:29 msgid "Planned" msgstr "Geplant" @@ -1840,19 +1859,19 @@ msgstr "" #: templates/web/default/auth/token.html:17 msgid "Please check your email" -msgstr "Bitte überprüfen sie ihre eMail" +msgstr "Bitte überprüfen sie ihr E-Mail" #: templates/web/default/auth/general.html:14 #: templates/web/default/auth/general.html:8 #: templates/web/fixmystreet/auth/general.html:15 #: templates/web/fixmystreet/auth/general.html:9 msgid "Please check your email address is correct" -msgstr "Bitte überprüfen Sie ob Ihre eMail-Adresse korrekt ist" +msgstr "Bitte überprüfen Sie ob Ihre E-Mail Adresse korrekt ist" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:824 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:831 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:850 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:893 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:822 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:829 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:848 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:891 #: perllib/FixMyStreet/DB/Result/Problem.pm:355 #: templates/web/default/js/validation_strings.html:9 msgid "Please choose a category" @@ -1878,13 +1897,10 @@ msgstr "" #: templates/web/default/report/new/notes.html:7 #: templates/web/fixmystreet/report/new/notes.html:6 -#, fuzzy msgid "" -"Please do not be abusive — abusing your council devalues the service " -"for all users." +"Please do not be abusive — abusing your council devalues the " +"service for all users." msgstr "" -"Bitte missbrauchen Sie diesen Service nicht. Die Schaden damit nicht nur der " -"Verwaltung, sondern sämtlichen Bewohnern von Zü,rich." #: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: templates/web/default/js/validation_strings.html:2 @@ -1906,12 +1922,12 @@ msgstr "" #: templates/web/default/js/validation_strings.html:12 #: templates/web/default/js/validation_strings.html:16 msgid "Please enter a valid email" -msgstr "Bitte geben Sie eine gültige eMail-Adresse an" +msgstr "Bitte geben Sie eine gültige E-Mail Adresse an" #: perllib/FixMyStreet/App/Controller/Alert.pm:346 #: perllib/FixMyStreet/App/Controller/Contact.pm:107 msgid "Please enter a valid email address" -msgstr "Bitte geben Sie eine gültige eMail-Adresse an" +msgstr "Bitte geben Sie eine gültige E-Mail Adresse an" #: perllib/FixMyStreet/DB/Result/Problem.pm:333 #: templates/web/default/js/validation_strings.html:4 @@ -1927,12 +1943,13 @@ msgstr "Bitte geben Sie einiges Details an" #: templates/web/fixmystreet/auth/general.html:14 #: templates/web/fixmystreet/auth/general.html:9 msgid "Please enter your email" -msgstr "Bitte geben Sie Ihre eMail-Adresse an" +msgstr "Bitte geben Sie Ihre E-Mail Adresse an" #: templates/web/bromley/report/new/fill_in_details_form.html:149 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:150 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:161 +#: templates/web/zurich/report/new/fill_in_details_form.html:110 msgid "Please enter your email address" -msgstr "Bitte geben Sie eine Ihre eMail-Adresse an" +msgstr "Bitte geben Sie Ihre E-Mail Adresse an." #: templates/web/default/js/validation_strings.html:19 #, fuzzy @@ -1960,9 +1977,8 @@ msgid "Please enter your second name" msgstr "Bitte geben Sie Ihren Namen an" #: templates/web/default/js/validation_strings.html:18 -#, fuzzy msgid "Please enter your title" -msgstr "Bitte geben Sie Ihre eMail-Adresse an" +msgstr "Bitte geben Sie Iher E-Mail-Adresse an" #: templates/web/emptyhomes/report/new/fill_in_details_text.html:1 msgid "" @@ -1982,7 +1998,7 @@ msgstr "" #: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1 #: templates/web/fixmybarangay/report/new/fill_in_details_text.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 -#: templates/web/fixmystreet/report/new/fill_in_details_text.html:11 +#: templates/web/fixmystreet/report/new/fill_in_details_text.html:8 msgid "Please fill in details of the problem below." msgstr "" @@ -2018,12 +2034,14 @@ msgstr "" "ein Photo des Mangels hoch." #: templates/web/fixmystreet/report/new/fill_in_details_form.html:70 +#: templates/web/zurich/report/new/fill_in_details_form.html:64 msgid "Please fill in details of the problem." -msgstr "" +msgstr "Beschreiben Sie den Mangel." #: templates/web/bromley/report/new/fill_in_details_form.html:28 #: templates/web/default/report/new/fill_in_details_form.html:27 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:35 +#: templates/web/zurich/report/new/fill_in_details_form.html:35 msgid "" "Please fill in the form below with details of the problem, and describe the " "location as precisely as possible in the details box." @@ -2037,7 +2055,7 @@ msgstr "" msgid "Please note that updates are not sent to the council." msgstr "" -#: templates/web/default/report/display.html:56 +#: templates/web/default/report/update-form.html:7 msgid "" "Please note that updates are not sent to the council. If you leave your name " "it will be public. Your information will only be used in accordance with our " @@ -2057,6 +2075,7 @@ msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:23 #: templates/web/default/report/new/fill_in_details_form.html:5 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:26 +#: templates/web/zurich/report/new/fill_in_details_form.html:26 msgid "" "Please note your report has <strong>not yet been sent</strong>. Choose a " "category and add further information below, then submit." @@ -2111,7 +2130,7 @@ msgid "Please write a message" msgstr "" #: templates/web/bromley/report/display.html:70 -#: templates/web/fixmystreet/report/display.html:85 +#: templates/web/fixmystreet/report/update-form.html:23 msgid "Please write your update here" msgstr "" @@ -2119,13 +2138,13 @@ msgstr "" #: templates/web/bromley/report/display.html:149 #: templates/web/bromley/report/display.html:161 #: templates/web/default/contact/index.html:93 -#: templates/web/default/report/display.html:119 -#: templates/web/default/report/display.html:156 -#: templates/web/default/report/display.html:178 +#: templates/web/default/report/update-form.html:107 +#: templates/web/default/report/update-form.html:129 +#: templates/web/default/report/update-form.html:70 #: templates/web/fixmystreet/contact/index.html:93 -#: templates/web/fixmystreet/report/display.html:131 -#: templates/web/fixmystreet/report/display.html:155 -#: templates/web/fixmystreet/report/display.html:183 +#: templates/web/fixmystreet/report/update-form.html:121 +#: templates/web/fixmystreet/report/update-form.html:69 +#: templates/web/fixmystreet/report/update-form.html:93 msgid "Post" msgstr "" @@ -2167,7 +2186,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:833 +#: perllib/FixMyStreet/App/Controller/Admin.pm:849 msgid "Problem marked as open." msgstr "" @@ -2185,7 +2204,7 @@ msgstr "Meldungen in dieser Gegend" #: templates/web/bromley/report/display.html:31 #: templates/web/fixmystreet/around/tabbed_lists.html:4 -#: templates/web/fixmystreet/report/display.html:31 +#: templates/web/fixmystreet/report/display.html:35 msgid "Problems nearby" msgstr "Meldungen in der Nähe" @@ -2202,7 +2221,7 @@ msgstr "Meldungen, welche kürzlich gelöst wurden" msgid "Problems within %.1fkm of this location" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:611 +#: perllib/FixMyStreet/Cobrand/Default.pm:612 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:95 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:162 #: perllib/FixMyStreet/Cobrand/UK.pm:231 @@ -2214,8 +2233,8 @@ msgstr "Meldungen innerhalb %s" msgid "Problems within %s ward" msgstr "" -#: templates/web/default/reports/council.html:0 -#: templates/web/default/reports/council.html:29 +#: templates/web/default/reports/body.html:0 +#: templates/web/default/reports/body.html:29 msgid "Problems within %s, FixMyStreet" msgstr "" @@ -2229,7 +2248,7 @@ msgstr "" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:616 msgid "Property type:" msgstr "" @@ -2239,8 +2258,8 @@ msgid "Provide a title" msgstr "" #: templates/web/bromley/report/display.html:57 -#: templates/web/default/report/display.html:51 -#: templates/web/fixmystreet/report/display.html:66 +#: templates/web/default/report/update-form.html:3 +#: templates/web/fixmystreet/report/update-form.html:4 msgid "Provide an update" msgstr "Meldung aktualisieren" @@ -2251,10 +2270,10 @@ msgid "" msgstr "" #: templates/web/bromley/report/display.html:142 -#: templates/web/default/report/display.html:175 #: templates/web/default/report/new/fill_in_details_form.html:173 -#: templates/web/fixmystreet/report/display.html:176 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:201 +#: templates/web/default/report/update-form.html:126 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:212 +#: templates/web/fixmystreet/report/update-form.html:114 msgid "" "Providing a password is optional, but doing so will allow you to more easily " "report problems, leave updates and manage your reports." @@ -2297,7 +2316,7 @@ msgstr "" #: templates/web/default/reports/_rss.html:1 #: templates/web/fixmystreet/alert/_list.html:22 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:45 +#: templates/web/fixmystreet/report/display.html:49 msgid "RSS feed" msgstr "" @@ -2330,7 +2349,7 @@ msgstr "" msgid "RSS feed of problems in this %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:612 +#: perllib/FixMyStreet/Cobrand/Default.pm:613 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:96 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161 #: perllib/FixMyStreet/Cobrand/UK.pm:238 @@ -2350,7 +2369,7 @@ msgstr "" #: templates/web/bromley/report/display.html:37 #: templates/web/default/report/display.html:42 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:45 +#: templates/web/fixmystreet/report/display.html:49 msgid "RSS feed of updates to this problem" msgstr "" @@ -2358,7 +2377,7 @@ msgstr "" #: templates/web/default/alert/updates.html:9 #: templates/web/default/report/display.html:33 #: templates/web/fixmystreet/alert/updates.html:14 -#: templates/web/fixmystreet/report/display.html:47 +#: templates/web/fixmystreet/report/display.html:51 msgid "Receive email when updates are left on this problem." msgstr "Erhalten Sie Aktualisierungen dieser Meldung." @@ -2368,6 +2387,7 @@ msgid "Recent local problems, FixMyStreet" msgstr "" #: templates/web/default/reports/index.html:19 +#: templates/web/fixmybarangay/reports/index.html:23 msgid "Recently <br>fixed" msgstr "Kürzlich <br>gelöst" @@ -2377,9 +2397,9 @@ msgstr "Kürzlich <br>gelöst" msgid "Recently fixed" msgstr "Kürzlich gelöst" -#: templates/web/default/index.html:50 templates/web/fixmystreet/index.html:68 +#: templates/web/default/index.html:37 templates/web/fixmystreet/index.html:45 msgid "Recently reported problems" -msgstr "Kürzlich erfasste Meldungen" +msgstr "Kürzlich erfasste Meldungen:" #: templates/web/default/report/new/notes.html:9 #: templates/web/fixmystreet/report/new/notes.html:8 @@ -2389,10 +2409,11 @@ msgid "" "site remember that you can contact your council directly using their own " "website." msgstr "" -"Fix My Zürich wird primär dafür verwendet, physische Mä" -"ngel zu melden, welche behoben werden können. Wenn Ihr Problem dafü" -"r nicht passend erscheint, können sie die entsprechende Dienststelle " -"weiterhin telefonisch oder per eMail erreichen." +"Fix My Zürich dient dazu Mängel an der Infrastruktur zu melden. " +"Meldungen und Wünsche bezüglich Verbesserungen an der " +"Infrastruktur sowie Gestaltungsvorschläge können über Fix My " +"Zürich nicht berücksichtigt werden. Notfälle müssen der " +"Polizei gemeldet werden via Telefon 117." #: templates/web/fixmybarangay/report/new/notes.html:9 msgid "" @@ -2418,12 +2439,13 @@ msgstr "" #: templates/web/fiksgatami/footer.html:5 #: templates/web/fiksgatami/nn/footer.html:5 #: templates/web/fixmystreet/footer.html:45 -#: templates/web/reading/footer.html:6 +#: templates/web/reading/footer.html:6 templates/web/stevenage/footer.html:39 +#: templates/web/zurich/footer.html:10 msgid "Report a problem" msgstr "Eine Meldung erfassen" #: templates/web/bromley/report/display.html:28 -#: templates/web/fixmystreet/report/display.html:26 +#: templates/web/fixmystreet/report/display.html:29 msgid "Report abuse" msgstr "Missbrauch melden" @@ -2431,14 +2453,16 @@ msgstr "Missbrauch melden" msgid "Report empty properties" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:277 +#: perllib/FixMyStreet/App/Controller/Rss.pm:286 msgid "Report on %s" msgstr "" #: templates/web/default/index.html:15 -#: templates/web/fixmystreet/around/postcode_form.html:9 +#: templates/web/fixmystreet/around/intro.html:1 +#: templates/web/stevenage/around/intro.html:1 +#: templates/web/zurich/around/intro.html:1 msgid "Report, view, or discuss local problems" -msgstr "Melden sie Mängel an der Infrastruktur von Zürich" +msgstr "Melden Sie Mängel an der Infrastruktur von Zürich" #: templates/web/default/my/my.html:74 msgid "Reported %s" @@ -2498,8 +2522,14 @@ msgstr "" #: templates/web/fixmystreet/report/new/fill_in_details.html:0 #: templates/web/fixmystreet/report/new/fill_in_details.html:5 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 +#: templates/web/zurich/report/new/fill_in_details_form.html:2 msgid "Reporting a problem" -msgstr "Verfassen Sie eine Meldung" +msgstr "Ihre Meldung" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1033 +#, fuzzy +msgid "Reports" +msgstr "Alle Meldungen" #: templates/web/default/around/tabbed_lists.html:3 msgid "Reports on and around the map" @@ -2509,13 +2539,13 @@ msgstr "" msgid "Resend report" msgstr "" -#: perllib/FixMyStreet/Geocode/OSM.pm:168 +#: perllib/FixMyStreet/Geocode/OSM.pm:173 msgid "" "Road operator for this named road (derived from road reference number and " "type): %s" msgstr "" -#: perllib/FixMyStreet/Geocode/OSM.pm:165 +#: perllib/FixMyStreet/Geocode/OSM.pm:170 msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" @@ -2523,26 +2553,15 @@ msgstr "" msgid "Save changes" msgstr "Änderungen speichern" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 -msgid "Search Abuse" -msgstr "" - -#: templates/web/default/admin/search_abuse.html:1 -msgid "Search Abuse Table" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Admin.pm:1037 #: templates/web/default/admin/list_flagged.html:1 #: templates/web/default/admin/search_reports.html:1 msgid "Search Reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1040 #: templates/web/default/admin/search_users.html:1 msgid "Search Users" msgstr "" -#: templates/web/default/admin/search_abuse.html:4 #: templates/web/default/admin/search_reports.html:5 #: templates/web/default/admin/search_users.html:5 msgid "Search:" @@ -2555,7 +2574,7 @@ msgid "" "or enter your email address to subscribe to an email alert." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:626 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 msgid "Sent to %s %s later" msgstr "" @@ -2567,7 +2586,7 @@ msgstr "Gesendet:" msgid "Service:" msgstr "" -#: templates/web/fixmystreet/report/display.html:29 +#: templates/web/fixmystreet/report/display.html:33 msgid "Share" msgstr "" @@ -2595,11 +2614,11 @@ msgstr "" #: templates/web/bromley/report/display.html:203 #: templates/web/bromley/report/new/fill_in_details_form.html:129 #: templates/web/bromley/report/new/fill_in_details_form.html:175 -#: templates/web/default/report/display.html:208 #: templates/web/default/report/new/fill_in_details_form.html:210 -#: templates/web/fixmystreet/report/display.html:207 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:128 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:196 +#: templates/web/default/report/update-form.html:155 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:139 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:207 +#: templates/web/fixmystreet/report/update-form.html:142 msgid "Show my name publicly" msgstr "" @@ -2613,12 +2632,12 @@ msgstr "Zeige Stecknadeln" #: templates/web/default/auth/general.html:3 #: templates/web/default/auth/general.html:49 -#: templates/web/fixmybarangay/header.html:70 +#: templates/web/fixmybarangay/header.html:68 #: templates/web/fixmystreet/auth/general.html:3 #: templates/web/fixmystreet/auth/general.html:42 #: templates/web/fixmystreet/auth/general.html:62 -#: templates/web/fixmystreet/header.html:51 -#: templates/web/zurich/header.html:51 +#: templates/web/fixmystreet/header.html:53 +#: templates/web/stevenage/header.html:101 templates/web/zurich/header.html:51 msgid "Sign in" msgstr "" @@ -2637,6 +2656,7 @@ msgstr "" #: templates/web/emptyhomes/header.html:41 #: templates/web/fiksgatami/header.html:22 #: templates/web/fiksgatami/nn/header.html:22 +#: templates/web/fixmybarangay/auth/sign_out.html:1 #: templates/web/lichfielddc/header.html:177 #: templates/web/reading/header.html:33 msgid "Sign out" @@ -2680,15 +2700,16 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:213 -#: perllib/FixMyStreet/Geocode.pm:27 perllib/FixMyStreet/Geocode/Bing.pm:51 -#: perllib/FixMyStreet/Geocode/Google.pm:69 -#: perllib/FixMyStreet/Geocode/OSM.pm:61 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:211 +#: perllib/FixMyStreet/Geocode.pm:28 perllib/FixMyStreet/Geocode/Bing.pm:58 +#: perllib/FixMyStreet/Geocode/Google.pm:74 +#: perllib/FixMyStreet/Geocode/OSM.pm:66 msgid "Sorry, we could not find that location." msgstr "" -#: perllib/FixMyStreet/Geocode/Bing.pm:46 -#: perllib/FixMyStreet/Geocode/Google.pm:64 +#: perllib/FixMyStreet/Geocode/Bing.pm:53 +#: perllib/FixMyStreet/Geocode/Google.pm:69 +#: perllib/FixMyStreet/Geocode/Zurich.pm:82 msgid "Sorry, we could not parse that location. Please try again." msgstr "" @@ -2713,17 +2734,17 @@ msgstr "" #: templates/web/default/admin/list_flagged.html:18 #: templates/web/default/admin/list_updates.html:6 #: templates/web/default/admin/search_reports.html:21 -#: templates/web/fixmystreet/report/display.html:88 +#: templates/web/fixmystreet/report/update-form.html:26 msgid "State" msgstr "" #: templates/web/default/admin/report_edit.html:17 #: templates/web/default/admin/update_edit.html:18 -#: templates/web/default/report/display.html:77 +#: templates/web/default/report/update-form.html:28 msgid "State:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1043 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1038 #: templates/web/default/admin/stats.html:1 msgid "Stats" msgstr "" @@ -2751,9 +2772,10 @@ msgstr "Titel:" #: templates/web/default/report/new/fill_in_details_form.html:114 #: templates/web/default/report/new/fill_in_details_form.html:154 #: templates/web/default/report/new/fill_in_details_form.html:176 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:141 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:166 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:211 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:152 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:177 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:222 +#: templates/web/zurich/report/new/fill_in_details_form.html:128 msgid "Submit" msgstr "Abschicken" @@ -2772,7 +2794,7 @@ msgstr "" #: templates/web/default/alert/updates.html:17 #: templates/web/default/report/display.html:38 #: templates/web/fixmystreet/alert/updates.html:23 -#: templates/web/fixmystreet/report/display.html:52 +#: templates/web/fixmystreet/report/display.html:56 msgid "Subscribe" msgstr "" @@ -2786,7 +2808,7 @@ msgstr "" msgid "Subscribe to an alert based upon what baranagay you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1035 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1031 #: templates/web/default/admin/index.html:1 msgid "Summary" msgstr "Zusammenfassung" @@ -2795,10 +2817,14 @@ msgstr "Zusammenfassung" #: templates/web/emptyhomes/reports/index.html:1 #: templates/web/fiksgatami/nn/reports/index.html:1 #: templates/web/fiksgatami/reports/index.html:1 +#: templates/web/fixmybarangay/reports/index.html:1 msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1039 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1035 +msgid "Survey" +msgstr "" + #: templates/web/default/admin/questionnaire.html:1 msgid "Survey Results" msgstr "" @@ -2886,13 +2912,13 @@ msgid "" "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Council.pm:91 +#: perllib/FixMyStreet/App/Controller/Council.pm:90 msgid "" "That location does not appear to be covered by a council; perhaps it is " "offshore or outside the country. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Location.pm:120 +#: perllib/FixMyStreet/App/Controller/Location.pm:121 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -2950,20 +2976,15 @@ msgstr "" #: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 #: templates/web/fixmystreet/report/new/fill_in_details_text.html:3 -#, fuzzy msgid "" -"The council won’t be able to help unless you leave as much\n" -"detail as you can. Please describe the exact location of the problem (e.g. " -"on a\n" -"wall), what it is, how long it has been there, a description (and a photo " -"of\n" -"the problem if you have one), etc." +"The council won’t be able to help unless you leave as much detail as " +"you can. Please describe the exact location of the problem (e.g. on a wall), " +"what it is, how long it has been there, a description (and a photo of the " +"problem if you have one), etc." msgstr "" -"Bitte beschreiben sie Ihre Meldung weiter unten. Wir können den Mangel " -"nur beheben, wenn Sie soviel Details wie möglich angeben: Beschreiben " -"sie die exakte Lage (z.B. An der Wand Richtung Strasse), was genau der " -"Mangel ist, wie lange dieser schon da ist und laden sie wenn möglich " -"ein Photo des Mangels hoch." +"Bitte machen Sie so genaue Angaben wie möglich: Beschreiben Sie die Art " +"des Mangels und wo er sich befindet (z.B. an der Wand). Senden Sie uns ein " +"Photo des Mangels." #: templates/web/fixmystreet/questionnaire/index.html:43 msgid "The details of your problem are available from the other tab above." @@ -2988,7 +3009,7 @@ msgid "" "requested_datetime, updated_datetime, service_code and service_name." msgstr "" -#: perllib/FixMyStreet/Geocode/OSM.pm:160 +#: perllib/FixMyStreet/Geocode/OSM.pm:165 msgid "" "The following information about the nearest road might be inaccurate or " "irrelevant, if the problem is close to several roads or close to a road " @@ -3063,6 +3084,7 @@ msgstr "" #: templates/web/default/report/new/councils_text_some.html:11 #: templates/web/default/report/new/fill_in_details_form.html:17 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 +#: templates/web/zurich/report/new/fill_in_details_form.html:12 msgid "" "The subject and details of the problem will be public, plus your name if you " "give us permission." @@ -3083,7 +3105,7 @@ msgstr "" msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:738 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:736 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 #: templates/web/default/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:24 @@ -3131,7 +3153,7 @@ msgid "" "it if you're not the correct council to deal with the issue." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:870 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:868 #: perllib/FixMyStreet/Cobrand/UK.pm:54 msgid "This information is required" msgstr "Diese Information wird benötigt" @@ -3142,14 +3164,20 @@ msgid "" "will be periodically deleted." msgstr "" -#: templates/web/emptyhomes/reports/council.html:58 +#: templates/web/emptyhomes/reports/body.html:58 msgid "This is a summary of all reports for one %s." msgstr "" -#: templates/web/emptyhomes/reports/council.html:60 +#: templates/web/emptyhomes/reports/body.html:60 msgid "This is a summary of all reports for this %s." msgstr "" +#: templates/web/fixmybarangay/reports/index.html:7 +msgid "" +"This is a summary of all reports on this site; select a particular barangay " +"to see the reports sent there." +msgstr "" + #: templates/web/default/reports/index.html:7 #: templates/web/emptyhomes/reports/index.html:4 #: templates/web/fiksgatami/nn/reports/index.html:4 @@ -3165,15 +3193,15 @@ msgstr "" #: templates/web/bromley/report/display.html:96 #: templates/web/default/report/banner.html:12 -#: templates/web/default/report/display.html:95 +#: templates/web/default/report/update-form.html:46 #: templates/web/emptyhomes/report/display.html:12 -#: templates/web/fixmystreet/report/display.html:106 +#: templates/web/fixmystreet/report/update-form.html:44 msgid "This problem has been fixed" msgstr "Dieser Mangel wurde behoben" #: templates/web/bromley/report/display.html:90 -#: templates/web/default/report/display.html:90 -#: templates/web/fixmystreet/report/display.html:100 +#: templates/web/default/report/update-form.html:41 +#: templates/web/fixmystreet/report/update-form.html:38 msgid "This problem has not been fixed" msgstr "Dieser Mangel wurde nicht behoben" @@ -3202,7 +3230,7 @@ msgid "" "This web page also contains a photo of the problem, provided by the user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1038 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1034 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -3256,7 +3284,7 @@ msgstr "Unbestätigt" msgid "Unknown" msgstr "Unbekannt" -#: perllib/FixMyStreet/App/Controller/Rss.pm:164 +#: perllib/FixMyStreet/App/Controller/Rss.pm:173 msgid "Unknown alert type" msgstr "" @@ -3265,7 +3293,7 @@ msgid "Unknown problem ID" msgstr "" #: templates/web/bromley/report/display.html:66 -#: templates/web/fixmystreet/report/display.html:81 +#: templates/web/fixmystreet/report/update-form.html:19 msgid "Update" msgstr "Beschreibung" @@ -3307,13 +3335,13 @@ msgstr "" msgid "Update statuses" msgstr "" -#: templates/web/default/report/display.html:71 +#: templates/web/default/report/update-form.html:22 msgid "Update:" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:708 -#: perllib/FixMyStreet/App/Controller/Admin.pm:823 -#: perllib/FixMyStreet/App/Controller/Admin.pm:903 +#: perllib/FixMyStreet/App/Controller/Admin.pm:839 +#: perllib/FixMyStreet/App/Controller/Admin.pm:899 msgid "Updated!" msgstr "" @@ -3336,14 +3364,15 @@ msgstr "" msgid "Updates to this problem, FixMyStreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1191 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1168 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1163 msgid "User flagged" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 #: templates/web/default/admin/list_flagged.html:30 msgid "Users" msgstr "" @@ -3358,7 +3387,7 @@ msgstr "" msgid "View report on site" msgstr "" -#: templates/web/default/reports/council.html:18 +#: templates/web/default/reports/body.html:18 msgid "View reports by ward" msgstr "" @@ -3381,8 +3410,8 @@ msgstr "" msgid "Viewing a problem" msgstr "" -#: templates/web/default/reports/council.html:20 -#: templates/web/emptyhomes/reports/council.html:18 +#: templates/web/default/reports/body.html:20 +#: templates/web/emptyhomes/reports/body.html:18 msgid "Wards of this council" msgstr "" @@ -3406,16 +3435,17 @@ msgid "" msgstr "" #: templates/web/bromley/report/display.html:141 -#: templates/web/fixmystreet/report/display.html:175 +#: templates/web/fixmystreet/report/update-form.html:113 msgid "We never show your email" -msgstr "Ihre eMail wird nie angezeigt" +msgstr "Ihr E-Mail wird nie angezeigt" #: templates/web/bromley/report/new/fill_in_details_form.html:133 #: templates/web/bromley/report/new/fill_in_details_form.html:179 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:133 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:200 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:144 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:211 +#: templates/web/zurich/report/new/fill_in_details_form.html:114 msgid "We never show your email address or phone number." -msgstr "Ihre eMail-Adresse oder Telefonnummer werden nie angezeigt" +msgstr "Ihre E-Mail Adresse oder Telefonnummer werden nie angezeigt" #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:351 msgid "" @@ -3424,8 +3454,8 @@ msgid "" "contact address, please do get in touch." msgstr "" -#: templates/web/default/index.html:34 templates/web/emptyhomes/index.html:59 -#: templates/web/fixmystreet/index.html:50 +#: templates/web/default/index-steps.html:16 +#: templates/web/emptyhomes/index.html:59 msgid "We send it to the council on your behalf" msgstr "" @@ -3440,13 +3470,12 @@ msgstr "" "\"/faq#privacy\">Datenschutzrichtlinien.</a>" #: templates/web/fixmystreet/report/new/notes.html:4 -#, fuzzy msgid "" "We will only use your personal information in accordance with our <a href=\"/" "privacy\">privacy policy.</a>" msgstr "" -"Wir verwenden Ihre persönlichen Daten nur entsprechend unserer <a href=" -"\"/faq#privacy\">Datenschutzrichtlinien.</a>" +"Ihre persönlichen Angaben werden nur für interne Zwecke verwendet " +"und nicht veröffentlicht." #: templates/web/emptyhomes/contact/blurb.html:2 msgid "" @@ -3471,7 +3500,7 @@ msgstr "Wann editiert" msgid "When sent" msgstr "Wann gesendet" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:613 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:611 msgid "Whole block of empty flats" msgstr "" @@ -3483,6 +3512,7 @@ msgid "" msgstr "" #: templates/web/fixmystreet/footer.html:22 +#: templates/web/stevenage/footer.html:22 msgid "" "Would you like better integration with FixMyStreet? <a href=\"http://www." "mysociety.org/for-councils/fixmystreet/\">Find out about FixMyStreet for " @@ -3490,6 +3520,7 @@ msgid "" msgstr "" #: templates/web/fixmystreet/footer.html:18 +#: templates/web/stevenage/footer.html:18 msgid "" "Would you like to contribute to FixMyStreet? Our code is open source and <a " "href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>." @@ -3538,8 +3569,8 @@ msgstr "Ja" #: templates/web/bromley/report/display.html:155 #: templates/web/bromley/report/new/fill_in_details_form.html:198 -#: templates/web/fixmystreet/report/display.html:149 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:160 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:171 +#: templates/web/fixmystreet/report/update-form.html:87 msgid "Yes I have a password" msgstr "" @@ -3557,13 +3588,13 @@ msgid "" "personal information, or similar:" msgstr "" -#: templates/web/emptyhomes/reports/council.html:64 +#: templates/web/emptyhomes/reports/body.html:64 msgid "" "You can <a href=\"%s\">view all reports for the council</a> or <a href=\"/" "reports\">show all councils</a>." msgstr "" -#: templates/web/emptyhomes/reports/council.html:66 +#: templates/web/emptyhomes/reports/body.html:66 msgid "You can <a href=\"/reports\">show all councils</a>." msgstr "" @@ -3586,34 +3617,36 @@ msgstr "" #: templates/web/default/questionnaire/index.html:92 #: templates/web/default/report/new/fill_in_details_form.html:93 #: templates/web/fixmystreet/questionnaire/index.html:87 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:103 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:99 +#: templates/web/zurich/report/new/fill_in_details_form.html:93 msgid "" "You have already attached a photo to this report, attaching another one will " "replace it." msgstr "" #: templates/web/bromley/report/display.html:106 -#: templates/web/default/report/display.html:106 -#: templates/web/fixmystreet/report/display.html:116 +#: templates/web/default/report/update-form.html:57 +#: templates/web/fixmystreet/report/update-form.html:54 msgid "" "You have already attached a photo to this update, attaching another one will " "replace it." msgstr "" #: templates/web/default/auth/sign_out.html:3 +#: templates/web/fixmybarangay/auth/sign_out.html:3 msgid "You have been signed out" msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:25 #: templates/web/default/report/new/fill_in_details_form.html:7 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:28 +#: templates/web/zurich/report/new/fill_in_details_form.html:28 msgid "" "You have located the problem at the point marked with a green pin on the " "map. If this is not the correct location, simply click on the map again. " msgstr "" -"Der grüne Pin auf der Karte repräsentiert ihre Meldung. Falls " -"dieser Ort nicht der Richtige ist, klicken Sie einfach nochmals am richtigen " -"Ort auf die Karte." +"Der grüne lokalisiert Ihre Meldung auf der Karte. Falls dieser Ort " +"nicht stimmt, kann der Pin verschoben werden." #: templates/web/default/tokens/confirm_alert.html:7 msgid "You have successfully confirmed your alert." @@ -3639,7 +3672,7 @@ msgstr "" msgid "You have successfully deleted your alert." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:745 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:743 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:140 msgid "" "You have successfully signed in; please check and confirm your details are " @@ -3670,28 +3703,30 @@ msgstr "" #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 #: templates/web/fixmystreet/contact/index.html:72 -#: templates/web/fixmystreet/report/display.html:49 -#: templates/web/fixmystreet/report/display.html:51 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:146 +#: templates/web/fixmystreet/report/display.html:53 +#: templates/web/fixmystreet/report/display.html:55 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:115 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:157 +#: templates/web/zurich/report/new/fill_in_details_form.html:106 msgid "Your email" -msgstr "Ihre eMail" +msgstr "Ihre E-Mail Adresse" #: templates/web/bromley/report/display.html:130 #: templates/web/fixmystreet/auth/general.html:26 -#: templates/web/fixmystreet/report/display.html:140 +#: templates/web/fixmystreet/report/update-form.html:78 msgid "Your email address" -msgstr "Ihre eMail-Adresse" +msgstr "Ihre E-Mail Adresse" #: templates/web/default/auth/general.html:27 msgid "Your email address:" -msgstr "Ihre eMail-Adresse:" +msgstr "Ihre E-Mail Adresse:" #: templates/web/default/alert/_list.html:92 -#: templates/web/default/report/display.html:128 #: templates/web/default/report/new/fill_in_details_form.html:124 +#: templates/web/default/report/update-form.html:79 #: templates/web/fixmybarangay/alert/_list.html:37 msgid "Your email:" -msgstr "Ihre eMail:" +msgstr "Ihre E-Mail:" #: templates/web/bromley/report/display.html:193 #: templates/web/bromley/report/new/fill_in_details_form.html:117 @@ -3718,24 +3753,25 @@ msgstr "Ihr Name" #: templates/web/fixmystreet/auth/general.html:57 #: templates/web/fixmystreet/contact/index.html:65 -#: templates/web/fixmystreet/report/display.html:203 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:123 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:191 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:124 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:202 +#: templates/web/fixmystreet/report/update-form.html:138 +#: templates/web/zurich/report/new/fill_in_details_form.html:122 msgid "Your name" msgstr "Ihr Name" #: templates/web/default/auth/general.html:59 #: templates/web/default/contact/index.html:68 -#: templates/web/default/report/display.html:202 #: templates/web/default/report/new/fill_in_details_form.html:203 +#: templates/web/default/report/update-form.html:149 msgid "Your name:" msgstr "Ihr Name:" #: templates/web/bromley/report/display.html:160 #: templates/web/bromley/report/new/fill_in_details_form.html:203 #: templates/web/fixmystreet/auth/general.html:41 -#: templates/web/fixmystreet/report/display.html:154 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:165 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:176 +#: templates/web/fixmystreet/report/update-form.html:92 msgid "Your password" msgstr "Ihr Passwort" @@ -3745,8 +3781,9 @@ msgstr "Ihr Passwort wurde geändert" #: templates/web/bromley/report/new/fill_in_details_form.html:137 #: templates/web/bromley/report/new/fill_in_details_form.html:184 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:138 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:205 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:149 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:216 +#: templates/web/zurich/report/new/fill_in_details_form.html:125 msgid "Your phone number" msgstr "Ihre Telefonnummer" @@ -3759,7 +3796,7 @@ msgstr "Ihre Meldung" #: templates/web/fiksgatami/footer.html:6 #: templates/web/fiksgatami/nn/footer.html:6 #: templates/web/fixmystreet/footer.html:47 -#: templates/web/reading/footer.html:7 +#: templates/web/reading/footer.html:7 templates/web/stevenage/footer.html:41 msgid "Your reports" msgstr "Ihre Meldungen" @@ -3768,22 +3805,21 @@ msgid "Your updates" msgstr "" #: templates/web/default/contact/index.html:76 -#, fuzzy msgid "Your email:" -msgstr "Ihre eMail:" +msgstr "Ihre E-Mail Adresse:" #: templates/web/default/admin/timeline.html:6 msgid "by %s" msgstr "" -#: templates/web/default/reports/council.html:12 -#: templates/web/default/reports/council.html:13 -#: templates/web/emptyhomes/reports/council.html:6 -#: templates/web/emptyhomes/reports/council.html:7 +#: templates/web/default/reports/body.html:12 +#: templates/web/default/reports/body.html:13 +#: templates/web/emptyhomes/reports/body.html:6 +#: templates/web/emptyhomes/reports/body.html:7 msgid "council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 +#: perllib/FixMyStreet/DB/Result/Problem.pm:608 msgid "council ref: %s" msgstr "" @@ -3792,7 +3828,7 @@ msgid "didn't use map" msgstr "hat Karte nicht verwendet" #: templates/web/default/alert/index.html:33 -#: templates/web/fixmystreet/around/postcode_form.html:23 +#: templates/web/fixmystreet/around/postcode_form.html:20 msgid "e.g. ‘%s’ or ‘%s’" msgstr "" @@ -3800,7 +3836,7 @@ msgstr "" msgid "from %d different users" msgstr "" -#: perllib/Utils.pm:295 +#: perllib/Utils.pm:267 msgid "less than a minute" msgstr "weniger als einer Minute" @@ -3824,6 +3860,10 @@ msgstr "" msgid "or" msgstr "oder" +#: templates/web/default/js/validation_strings.html:21 +msgid "or locate me automatically" +msgstr "oder automatisch lokalisieren" + #: templates/web/default/admin/report_edit.html:15 msgid "originally entered" msgstr "" @@ -3838,9 +3878,9 @@ msgstr "" #: templates/web/barnet/header.html:71 templates/web/bromley/header.html:100 #: templates/web/bromley/header.html:65 -#: templates/web/fixmybarangay/header.html:67 -#: templates/web/fixmystreet/header.html:48 -#: templates/web/zurich/header.html:48 +#: templates/web/fixmybarangay/header.html:65 +#: templates/web/fixmystreet/header.html:50 +#: templates/web/stevenage/header.html:98 templates/web/zurich/header.html:48 msgid "sign out" msgstr "ausloggen" @@ -3850,10 +3890,12 @@ msgstr "ausloggen" #: templates/web/default/report/new/fill_in_details_form.html:14 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:6 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:9 +#: templates/web/zurich/report/new/fill_in_details_form.html:6 +#: templates/web/zurich/report/new/fill_in_details_form.html:9 msgid "the local council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:549 +#: templates/web/default/report/_main.html:6 msgid "there is no pin shown as the user did not use the map" msgstr "" @@ -3861,7 +3903,7 @@ msgstr "" msgid "this type of local problem" msgstr "" -#: perllib/Utils.pm:269 +#: perllib/Utils.pm:241 msgid "today" msgstr "heute" @@ -3877,10 +3919,10 @@ msgstr "" msgid "user is problem owner" msgstr "" -#: templates/web/default/reports/council.html:0 -#: templates/web/default/reports/council.html:9 -#: templates/web/emptyhomes/reports/council.html:0 -#: templates/web/emptyhomes/reports/council.html:3 +#: templates/web/default/reports/body.html:0 +#: templates/web/default/reports/body.html:9 +#: templates/web/emptyhomes/reports/body.html:0 +#: templates/web/emptyhomes/reports/body.html:3 msgid "ward" msgstr "" @@ -3914,21 +3956,21 @@ msgstr "" msgid "your update will not be posted" msgstr "" -#: templates/web/default/front/stats.html:17 +#: templates/web/emptyhomes/front/stats.html:17 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:314 +#: perllib/Utils.pm:286 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d Stunde" msgstr[1] "%d Stunden" -#: perllib/Utils.pm:316 +#: perllib/Utils.pm:288 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -3942,21 +3984,21 @@ msgid_plural "<big>%s</big> updates on reports" msgstr[0] "<big>%s</big> Meldung bearbeitet" msgstr[1] "<big>%s</big> Meldungen bearbeitet" -#: templates/web/default/report/new/councils_text_none.html:5 +#: templates/web/emptyhomes/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." msgid_plural "" "We do not yet have details for the councils that cover this location." msgstr[0] "" -#: perllib/Utils.pm:310 +#: perllib/Utils.pm:282 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d Woche" msgstr[1] "%d Wochen" -#: templates/web/default/front/stats.html:12 +#: templates/web/emptyhomes/front/stats.html:12 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" @@ -3967,8 +4009,8 @@ msgstr[1] "<big>%s</big> Meldungen in der letzten Woche" #, perl-format msgid "<big>%s</big> fixed in past month" msgid_plural "<big>%s</big> fixed in past month" -msgstr[0] "<big>%s</big> im letzten Monat behoben" -msgstr[1] "<big>%s</big> im letzten Monat gehoben" +msgstr[0] "<big>%s</big> bearbeiteter Mangel im letzten Monat" +msgstr[1] "<big>%s</big> bearbeitete Mängel im letzten Monat" #: templates/web/default/report/new/councils_text_some.html:14 #, perl-format @@ -3981,7 +4023,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:312 +#: perllib/Utils.pm:284 #, perl-format msgid "%d day" msgid_plural "%d days" diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index bcf77f56c..db0887cd7 100644 --- a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -10,20 +10,20 @@ msgid "" msgstr "" "Project-Id-Version: FixMyStreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2012-08-21 09:54+0100\n" +"POT-Creation-Date: 2012-12-10 13:18+0000\n" "PO-Revision-Date: 2012-09-14 00:22+0100\n" "Last-Translator: Anders Einar Hilden <hildenae@gmail.com>\n" "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n" +"Language: Norwegian Bokmål\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: KBabel 1.11.4\n" "X-Poedit-Basepath: ../../../\n" -"Language: Norwegian Bokmål\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:555 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:337 +#: perllib/FixMyStreet/DB/Result/Problem.pm:560 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:339 msgid " and " msgstr " og " @@ -56,86 +56,55 @@ msgstr "%d bekreftede varsler, %d ubekreftede" msgid "%d council contacts – %d confirmed, %d unconfirmed" msgstr "%d administrasjonskontakter – %d bekreftet, %d ubekreftet" -#: perllib/Utils.pm:293 -msgid "%d day" -msgstr "%d dag" - -#: perllib/Utils.pm:293 -msgid "%d days" -msgstr "%d dager" - #: templates/web/default/admin/council_list.html:27 msgid "%d edits by %s" msgstr "%d redigeringer av %s" -#: perllib/Utils.pm:294 -msgid "%d hour" -msgstr "%d time" - -#: perllib/Utils.pm:294 -msgid "%d hours" -msgstr "%d timer" - #: templates/web/default/admin/index.html:16 msgid "%d live updates" msgstr "%d aktive oppdateringer" -#: perllib/Utils.pm:295 -msgid "%d minute" -msgstr "%d minutt" - -#: perllib/Utils.pm:295 -msgid "%d minutes" -msgstr "%d minutter" - #: templates/web/default/admin/index.html:18 msgid "%d questionnaires sent – %d answered (%s%%)" msgstr "%d spørreskjema sendt – %d besvart (%s%%)" -#: perllib/Utils.pm:292 -msgid "%d week" -msgstr "%d uke" - -#: perllib/Utils.pm:292 -msgid "%d weeks" -msgstr "%d uker" +#: templates/web/default/report/_support.html:3 +msgid "%d supporters" +msgstr "" -#: templates/web/default/reports/council.html:0 -#: templates/web/default/reports/council.html:26 -#: templates/web/emptyhomes/reports/council.html:11 -#: templates/web/emptyhomes/reports/council.html:13 +#: templates/web/default/reports/body.html:0 +#: templates/web/default/reports/body.html:26 +#: templates/web/emptyhomes/reports/body.html:11 +#: templates/web/emptyhomes/reports/body.html:13 msgid "%s - Summary reports" msgstr "%s - oppsummeringsrapporter" -#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "%s ref: %s" msgstr "%s ref: %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:288 perllib/FixMyStreet/Cobrand/UK.pm:300 +#: perllib/FixMyStreet/Cobrand/UK.pm:279 perllib/FixMyStreet/Cobrand/UK.pm:291 msgid "%s ward, %s" msgstr "%s bydel, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:488 +#: perllib/FixMyStreet/DB/Result/Problem.pm:496 msgid "%s, reported anonymously at %s" msgstr "%s, rapportert anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:490 +#: perllib/FixMyStreet/DB/Result/Problem.pm:498 msgid "%s, reported by %s at %s" msgstr "%s, rapportert av %s %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:315 perllib/FixMyStreet/Cobrand/UK.pm:327 +#: perllib/FixMyStreet/Cobrand/UK.pm:306 perllib/FixMyStreet/Cobrand/UK.pm:318 msgid "%s, within %s ward" msgstr "%s, innefor bydel %s" -#: templates/web/default/admin/stats.html:5 -msgid "%sreports between %s and %s" -msgstr "%srapporter mellom %s og %s" - #: templates/web/default/email_sent.html:28 msgid "(Don't worry — %s)" msgstr "(Ingen grunn til bekymring — %s)" #: templates/web/default/admin/report_blocks.html:11 +#: templates/web/default/admin/search_users.html:23 msgid "(Email in abuse table)" msgstr "(Epost i misbrukstabellen)" @@ -162,7 +131,7 @@ msgid "(fixed)" msgstr "(løst)" #: templates/web/default/index.html:12 templates/web/default/index.html:8 -#: templates/web/fixmystreet/around/postcode_form.html:7 +#: templates/web/fixmystreet/around/intro.html:2 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(som tagging, søppel, hull i veien, eller ødelagte gatelys)" @@ -172,6 +141,7 @@ msgid "(not sent to council)" msgstr "(ikke rapportert til administrasjonen)" #: templates/web/default/report/new/fill_in_details_form.html:217 +#: templates/web/zurich/report/new/fill_in_details_form.html:118 msgid "(optional)" msgstr "(valgfritt)" @@ -185,22 +155,22 @@ msgstr "(sendt til begge)" msgid "(we never show your email address or phone number)" msgstr "(vi viser aldri din e-postadresse eller telefonnummer)" -#: templates/web/default/report/display.html:209 +#: templates/web/default/report/update-form.html:156 msgid "(we never show your email)" msgstr "(vi viser aldri din e-postadresse)" -#: perllib/FixMyStreet/App/Controller/Admin.pm:284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:285 msgid "*unknown*" msgstr "*ukjent*" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:629 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:655 -#: perllib/FixMyStreet/DB/Result/Problem.pm:345 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:628 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:656 +#: perllib/FixMyStreet/DB/Result/Problem.pm:353 msgid "-- Pick a category --" msgstr "-- Velg en kategori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:609 -#: perllib/FixMyStreet/DB/Result/Problem.pm:351 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:359 msgid "-- Pick a property type --" msgstr "-- Velg en eiendomsstype --" @@ -210,6 +180,10 @@ msgstr "-- Velg en eiendomsstype --" msgid ". You can <a href=\"%s%s\">view the problem on this site</a>." msgstr ". Du kan <a href=\"%s\">lese om problemet på denne siden</a>." +#: templates/web/default/report/_support.html:3 +msgid "1 supporter" +msgstr "" + #: templates/web/default/questionnaire/completed.html:20 msgid "" "<p style=\"font-size:150%\">Thank you very much for filling in our " @@ -236,7 +210,7 @@ msgstr "" "av folk i nabolaget som jobber sammen, hva med å <a href=\"http://www." "pledgebank.com/new\">publisere en utfordring om å bidra</a>?</p>" -#: templates/web/fixmystreet/questionnaire/completed-open.html:1 +#: templates/web/fixmystreet/questionnaire/completed-open.html:6 msgid "" "<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" "suggestions: why not try <a href=\"http://www.writetothem.com/\">writing " @@ -254,7 +228,7 @@ msgstr "" "av folk i nabolaget som jobber sammen, hva med å <a href=\"http://www." "pledgebank.com/new\">publisere en utfordring om å bidra</a>?</p>" -#: templates/web/default/questionnaire/completed-open.html:1 +#: templates/web/default/questionnaire/completed-open.html:6 msgid "" "<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" "suggestions: why not try writing to your local representative or, if " @@ -317,8 +291,8 @@ msgstr "" "hit til\n" "nettstedet og legg igjen en oppdatering.</p>" -#: templates/web/default/around/display_location.html:70 -#: templates/web/default/around/display_location.html:72 +#: templates/web/default/around/_report_banner.html:3 +#: templates/web/default/around/_report_banner.html:5 #: templates/web/emptyhomes/around/display_location.html:36 #: templates/web/emptyhomes/around/display_location.html:38 msgid "" @@ -332,15 +306,15 @@ msgstr "" msgid "<strong>%d</strong> live problems" msgstr "<strong>%d</strong> aktive problemer" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:172 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:193 msgid "<strong>No</strong> Let me confirm my report by email" msgstr "<strong>Nei</strong> La meg bekrefte min rapport med e-post" -#: templates/web/fixmystreet/report/display.html:148 +#: templates/web/fixmystreet/report/update-form.html:108 msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Nei</strong> La meg bekrefte min oppdatering med e-post" -#: templates/web/fixmystreet/auth/general.html:46 +#: templates/web/fixmystreet/auth/general.html:50 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Nei</strong>, la meg logge inn med e-post:" @@ -352,17 +326,17 @@ msgstr "<strong>Nei</strong>, det gjør jeg ikke. La meg logge inn med e-post:" msgid "<strong>No</strong>, let me confirm my report by email:" msgstr "<strong>Nei</strong>, la meg bekrefte min rapport med e-post:" -#: templates/web/default/report/display.html:164 +#: templates/web/default/report/update-form.html:115 msgid "<strong>No</strong>, let me confirm my update by email:" msgstr "<strong>Nei</strong>, la meg bekrefte min oppdatering med e-post:" #: templates/web/default/auth/general.html:37 -#: templates/web/default/report/display.html:142 #: templates/web/default/report/new/fill_in_details_form.html:140 -#: templates/web/fixmystreet/auth/general.html:32 -#: templates/web/fixmystreet/auth/general.html:34 -#: templates/web/fixmystreet/report/display.html:131 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:154 +#: templates/web/default/report/update-form.html:93 +#: templates/web/fixmystreet/auth/general.html:36 +#: templates/web/fixmystreet/auth/general.html:38 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:169 +#: templates/web/fixmystreet/report/update-form.html:85 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Ja</strong> Jeg har et passord" @@ -374,11 +348,11 @@ msgstr "<strong>Ja</strong> Jeg har et passord" msgid "About us" msgstr "Om oss" -#: templates/web/default/admin/council_contacts.html:66 +#: templates/web/default/admin/council_contacts.html:72 msgid "Add new category" msgstr "Legg til ny kategori" -#: templates/web/default/my/my.html:56 templates/web/fixmystreet/my/my.html:56 +#: templates/web/default/my/my.html:56 templates/web/fixmystreet/my/my.html:60 msgid "Added %s" msgstr "La til %s" @@ -395,16 +369,13 @@ msgid "Alert %d disabled (created %s)" msgstr "Varsel %d koblet ut (opprettet %s)" #: templates/web/bromley/report/display.html:207 -#: templates/web/default/report/display.html:214 -#: templates/web/fixmystreet/report/display.html:189 +#: templates/web/default/report/update-form.html:161 +#: templates/web/fixmystreet/report/update-form.html:146 msgid "Alert me to future updates" msgstr "Send meg varsel ved fremtidige oppdateringer" -#: templates/web/default/admin/stats.html:5 -msgid "All" -msgstr "Alle" - #: templates/web/default/reports/index.html:3 +#: templates/web/fixmybarangay/reports/index.html:3 msgid "All Reports" msgstr "Alle rapporter" @@ -416,11 +387,18 @@ msgstr "Alle bekreftet" #: templates/web/bromley/header.html:77 templates/web/default/footer.html:11 #: templates/web/fiksgatami/footer.html:7 #: templates/web/fiksgatami/nn/footer.html:7 +#: templates/web/fixmybarangay/footer.html:20 #: templates/web/fixmystreet/footer.html:49 -#: templates/web/reading/footer.html:8 +#: templates/web/reading/footer.html:8 templates/web/stevenage/footer.html:43 +#: templates/web/zurich/footer.html:12 msgid "All reports" msgstr "Alle rapporter" +#: templates/web/default/admin/stats.html:5 +#, fuzzy +msgid "All reports between %s and %s" +msgstr "%srapporter mellom %s og %s" + #: templates/web/default/report/new/councils_text_some.html:2 msgid "All the information you provide here will be sent to" msgstr "All informasjonen du har lagt inn her vil bli sendt til" @@ -452,6 +430,8 @@ msgstr "" #: templates/web/default/report/new/fill_in_details_form.html:13 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:6 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:8 +#: templates/web/zurich/report/new/fill_in_details_form.html:6 +#: templates/web/zurich/report/new/fill_in_details_form.html:8 msgid "" "All the information you provide here will be sent to <strong>%s</strong>." msgstr "" @@ -494,10 +474,12 @@ msgstr "" "FiksGataMi?" #: templates/web/fixmystreet/footer.html:17 +#: templates/web/stevenage/footer.html:17 msgid "Are you a developer?" msgstr "Er du en utvikler?" #: templates/web/fixmystreet/footer.html:21 +#: templates/web/stevenage/footer.html:21 msgid "Are you from a council?" msgstr "Der du fra den lokale administrasjonen?" @@ -519,6 +501,16 @@ msgstr "For øyeblikket er det kun søk etter og å se på rapporter som fungere msgid "Ban email address" msgstr "Bannlys epostadresse" +#: templates/web/fixmybarangay/report/new/notes.html:7 +msgid "" +"Be sure to choose the right category, because we use that to determine to " +"whom the report is sent." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1032 +msgid "Bodies" +msgstr "" + #: templates/web/fiksgatami/footer.html:16 #: templates/web/fiksgatami/nn/footer.html:16 msgid "" @@ -532,21 +524,22 @@ msgstr "" msgid "By Date" msgstr "På dato" -#: templates/web/fixmystreet/around/display_location.html:80 -#: templates/web/fixmystreet/around/display_location.html:82 +#: templates/web/fixmystreet/around/_report_banner.html:10 +#: templates/web/fixmystreet/around/_report_banner.html:8 msgid "Can't see the map? <a href='%s' rel='nofollow'>Skip this step</a>" msgstr "" "Hvis du ikke kan se kartet, <a href='%s' rel='nofollow'>hopp over dette " "steget</a>." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:657 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:631 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: templates/web/bromley/report/new/fill_in_details_form.html:68 -#: templates/web/default/admin/council_contacts.html:35 +#: templates/web/default/admin/council_contacts.html:37 #: templates/web/default/admin/index.html:36 #: templates/web/default/admin/list_flagged.html:14 #: templates/web/default/admin/search_reports.html:17 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:72 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:74 +#: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Category" msgstr "Kategori" @@ -554,14 +547,14 @@ msgstr "Kategori" msgid "Category fix rate for problems > 4 weeks old" msgstr "Løsningsrate fordelt på kategori for problemer > 4 uker gamle" -#: templates/web/default/admin/council_contacts.html:72 +#: templates/web/default/admin/council_contacts.html:78 #: templates/web/default/admin/council_edit.html:23 #: templates/web/default/admin/report_edit.html:25 #: templates/web/default/report/new/fill_in_details_form.html:67 msgid "Category:" msgstr "Kategori:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:334 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:336 msgid "Category: %s" msgstr "Kategori: %s" @@ -571,8 +564,8 @@ msgstr "Kategori: %s" msgid "Change Password" msgstr "Bytt passord" -#: templates/web/fixmystreet/around/display_location.html:72 -#: templates/web/fixmystreet/around/display_location.html:73 +#: templates/web/default/js/validation_strings.html:22 +#: templates/web/fixmystreet/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "Klikk i kartet for å rapportere et problem" @@ -580,21 +573,21 @@ msgstr "Klikk i kartet for å rapportere et problem" #: templates/web/bromley/report/display.html:82 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:20 -#: templates/web/default/dashboard/index.html:136 #: templates/web/default/dashboard/index.html:138 -#: templates/web/default/report/display.html:79 -#: templates/web/default/report/display.html:81 +#: templates/web/default/dashboard/index.html:140 +#: templates/web/default/report/update-form.html:30 +#: templates/web/default/report/update-form.html:32 #: templates/web/fixmystreet/report/banner.html:15 -#: templates/web/fixmystreet/report/display.html:74 -#: templates/web/fixmystreet/report/display.html:76 +#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/fixmystreet/report/update-form.html:30 msgid "Closed" msgstr "Lukket" -#: perllib/FixMyStreet/DB/Result/Problem.pm:690 +#: perllib/FixMyStreet/DB/Result/Problem.pm:695 msgid "Closed by council" msgstr "(ikke rapportert til administrasjonen)" -#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:32 +#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:36 msgid "Closed reports" msgstr "Fiksede rapporter" @@ -602,8 +595,8 @@ msgstr "Fiksede rapporter" msgid "Closed:" msgstr "Lukket:" -#: templates/web/default/around/display_location.html:103 -#: templates/web/default/around/display_location.html:105 +#: templates/web/default/around/tabbed_lists.html:10 +#: templates/web/default/around/tabbed_lists.html:12 msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "De nærmeste problemene <small>(innenfor %skm)</small>" @@ -627,23 +620,28 @@ msgstr "Merkevaresamarbeidsdata:" msgid "Cobrand:" msgstr "Merkevaresamarbeid:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:358 +#: perllib/FixMyStreet/App/Controller/Admin.pm:365 msgid "Configuration updated" msgstr "Oppsett oppdatert" -#: perllib/FixMyStreet/App/Controller/Admin.pm:372 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 msgid "Configuration updated - contacts will be generated automatically later" msgstr "Oppsett oppdatert - kontakter vil bli generert automatisk senere" -#: templates/web/default/admin/council_contacts.html:153 +#: templates/web/default/admin/council_edit.html:34 +#, fuzzy +msgid "Configure Endpoint" +msgstr "Sett opp Open311" + +#: templates/web/default/admin/council_contacts.html:168 msgid "Configure Open311" msgstr "Sett opp Open311" -#: templates/web/default/admin/council_contacts.html:105 +#: templates/web/default/admin/council_contacts.html:116 msgid "Configure Open311 integration" msgstr "Sett opp Open311-integrasjon" -#: templates/web/default/admin/council_contacts.html:42 +#: templates/web/default/admin/council_contacts.html:46 msgid "Confirm" msgstr "Bekreft" @@ -651,6 +649,13 @@ msgstr "Bekreft" msgid "Confirm account" msgstr "Bekreft konto" +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:187 +#: templates/web/fixmystreet/report/update-form.html:103 +msgid "" +"Confirm by email below, providing a new password at that point. When you " +"confirm, your password will be updated." +msgstr "" + #: templates/web/default/questionnaire/creator_fixed.html:1 #: templates/web/default/tokens/confirm_problem.html:1 #: templates/web/default/tokens/confirm_problem.html:3 @@ -658,17 +663,23 @@ msgstr "Bekreft konto" #: templates/web/default/tokens/confirm_update.html:3 #: templates/web/emptyhomes/tokens/confirm_problem.html:1 #: templates/web/emptyhomes/tokens/confirm_problem.html:3 +#: templates/web/southampton/tokens/confirm_problem.html:1 +#: templates/web/southampton/tokens/confirm_problem.html:3 msgid "Confirmation" msgstr "Bekreftelse" -#: templates/web/default/admin/council_contacts.html:37 -#: templates/web/default/admin/council_contacts.html:82 +#: templates/web/default/admin/council_contacts.html:39 +#: templates/web/default/admin/council_contacts.html:88 #: templates/web/default/admin/council_edit.html:28 -#: templates/web/default/admin/council_edit.html:43 -#: templates/web/default/admin/stats.html:5 +#: templates/web/default/admin/council_edit.html:71 msgid "Confirmed" msgstr "Bekreftet" +#: templates/web/default/admin/stats.html:5 +#, fuzzy +msgid "Confirmed reports between %s and %s" +msgstr "%srapporter mellom %s og %s" + #: templates/web/default/admin/problem_row.html:23 #: templates/web/default/admin/report_edit.html:34 msgid "Confirmed:" @@ -699,8 +710,8 @@ msgstr "Kontakt oss" msgid "Contact the team" msgstr "Kontakt prosjektgruppen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1150 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1178 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1159 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1187 msgid "Could not find user" msgstr "Kunne ikke finne bruker" @@ -711,7 +722,6 @@ msgstr "Kunne ikke finne bruker" msgid "Council" msgstr "Administrasjon" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1022 #: templates/web/default/admin/council_list.html:1 msgid "Council contacts" msgstr "Administrasjonskontakter" @@ -739,7 +749,7 @@ msgstr "Antall" msgid "Create a report" msgstr "Lag en rapport" -#: templates/web/default/admin/council_contacts.html:96 +#: templates/web/default/admin/council_contacts.html:107 msgid "Create category" msgstr "Lag kategori" @@ -767,15 +777,16 @@ msgstr "For tiden har 1+ slettet" msgid "Dashboard" msgstr "Oversikt" -#: templates/web/default/admin/council_contacts.html:38 -#: templates/web/default/admin/council_contacts.html:85 +#: templates/web/default/admin/council_contacts.html:40 +#: templates/web/default/admin/council_contacts.html:91 #: templates/web/default/admin/council_edit.html:29 -#: templates/web/default/admin/council_edit.html:44 +#: templates/web/default/admin/council_edit.html:72 msgid "Deleted" msgstr "Slettet" #: templates/web/bromley/report/new/fill_in_details_form.html:54 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:64 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 +#: templates/web/zurich/report/new/fill_in_details_form.html:60 msgid "Details" msgstr "Detaljer" @@ -784,14 +795,23 @@ msgstr "Detaljer" msgid "Details:" msgstr "Detaljer:" +#: templates/web/default/admin/council_contacts.html:41 +msgid "Devolved" +msgstr "" + #: templates/web/default/admin/council_list.html:23 msgid "Diligency prize league table" msgstr "Arbeidshester" +#: templates/web/fixmystreet/auth/general.html:30 +#, fuzzy +msgid "Do you have a FixMyBarangay password?" +msgstr "Har du et FiksGataMi-passord?" + #: templates/web/default/auth/general.html:32 -#: templates/web/fixmystreet/auth/general.html:29 -#: templates/web/fixmystreet/report/display.html:128 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:150 +#: templates/web/fixmystreet/auth/general.html:32 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:165 +#: templates/web/fixmystreet/report/update-form.html:82 msgid "Do you have a FixMyStreet password?" msgstr "Har du et FiksGataMi-passord?" @@ -818,33 +838,32 @@ msgstr "Redigerer oppdatering %d" msgid "Editing user %d" msgstr "Redigerer bruker %d" -#: templates/web/default/admin/council_edit.html:45 +#: templates/web/default/admin/council_edit.html:73 msgid "Editor" msgstr "Oppdatert av" #: templates/web/bromley/report/display.html:126 -#: templates/web/default/admin/council_contacts.html:36 -#: templates/web/default/admin/council_edit.html:42 +#: templates/web/default/admin/council_contacts.html:38 +#: templates/web/default/admin/council_edit.html:70 #: templates/web/default/admin/list_flagged.html:12 #: templates/web/default/admin/list_flagged.html:35 #: templates/web/default/admin/list_updates.html:8 -#: templates/web/default/admin/search_abuse.html:11 #: templates/web/default/admin/search_reports.html:15 #: templates/web/default/admin/search_users.html:13 #: templates/web/fixmystreet/auth/general.html:20 -#: templates/web/fixmystreet/report/display.html:120 +#: templates/web/fixmystreet/report/update-form.html:74 msgid "Email" msgstr "E-post" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1126 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1135 msgid "Email added to abuse list" msgstr "Epost lagt til misbruksliste" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1123 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1132 msgid "Email already in abuse list" msgstr "Epost allerede i misbrukslisten" -#: templates/web/default/around/display_location.html:85 +#: templates/web/default/around/_updates.html:5 msgid "Email me new local problems" msgstr "Send meg e-post om lokale problemer" @@ -852,7 +871,7 @@ msgstr "Send meg e-post om lokale problemer" msgid "Email me updates" msgstr "Send meg oppdateringer" -#: templates/web/default/admin/council_contacts.html:77 +#: templates/web/default/admin/council_contacts.html:83 #: templates/web/default/admin/council_edit.html:26 #: templates/web/default/admin/report_edit.html:31 #: templates/web/default/admin/update_edit.html:24 @@ -862,15 +881,15 @@ msgstr "Send meg oppdateringer" msgid "Email:" msgstr "E-post:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:611 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:610 msgid "Empty flat or maisonette" msgstr "Tom leilighet" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:610 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:609 msgid "Empty house or bungalow" msgstr "Tomt hus eller bungalow" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:613 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:612 msgid "Empty office or other commercial" msgstr "Tomt kontor eller forretningsbygg" @@ -878,11 +897,11 @@ msgstr "Tomt kontor eller forretningsbygg" msgid "Empty property details form" msgstr "Tom eiendom detaljskjema" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:614 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:613 msgid "Empty pub or bar" msgstr "Tom pub eller bar" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:615 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:614 msgid "Empty public building - school, hospital, etc." msgstr "Tom offentlig bygning - skole, sykehos, etc." @@ -898,6 +917,12 @@ msgstr "Slutt-dag:" msgid "End month:" msgstr "Sluttmåned:" +# Kan "Oppgi" være bedre? +#: perllib/FixMyStreet/Cobrand/Zurich.pm:9 +#, fuzzy +msgid "Enter a Zürich street name" +msgstr "Skriv inn et veinavn og sted" + #: templates/web/emptyhomes/index.html:40 #: templates/web/emptyhomes/index.html:41 msgid "Enter a nearby GB postcode, or street name and area" @@ -921,21 +946,21 @@ msgid "Enter a nearby street name and area" msgstr "Skriv inn et veinavn og sted" #: templates/web/default/auth/general.html:64 -#: templates/web/default/report/display.html:171 #: templates/web/default/report/new/fill_in_details_form.html:169 +#: templates/web/default/report/update-form.html:122 msgid "Enter a new password:" msgstr "Skriv inn et nytt passord:" #: templates/web/bromley/report/display.html:148 #: templates/web/bromley/report/new/fill_in_details_form.html:189 -#: templates/web/fixmystreet/auth/general.html:57 -#: templates/web/fixmystreet/report/display.html:160 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:200 +#: templates/web/fixmystreet/auth/general.html:61 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:221 +#: templates/web/fixmystreet/report/update-form.html:120 msgid "Enter a password" msgstr "Skriv inn et nytt passord" -#: templates/web/default/index.html:33 templates/web/emptyhomes/index.html:58 -#: templates/web/fixmystreet/index.html:41 +#: templates/web/default/index-steps.html:11 +#: templates/web/emptyhomes/index.html:58 msgid "Enter details of the problem" msgstr "Legg inn detaljer om problemet" @@ -949,7 +974,7 @@ msgstr "Legg inn detaljer om problemet" msgid "Error" msgstr "Feil" -#: templates/web/default/admin/council_contacts.html:11 +#: templates/web/default/admin/council_contacts.html:13 #: templates/web/default/admin/council_edit.html:18 msgid "Example postcode %s" msgstr "Eksempel-postnummer %s" @@ -991,14 +1016,10 @@ msgstr "Fiks<span id=\"my\">Gata</span>Mi" msgid "FixMyStreet" msgstr "FiksGataMi" -#: templates/web/default/admin/header.html:13 +#: templates/web/default/admin/header.html:10 msgid "FixMyStreet admin:" msgstr "FiksGataMi-administrator:" -#: templates/web/default/admin/header.html:3 -msgid "FixMyStreet administration" -msgstr "Fiksgatami-administrasjon" - #: templates/web/default/alert/index.html:11 msgid "" "FixMyStreet has a variety of RSS feeds and email alerts for local problems, " @@ -1035,13 +1056,13 @@ msgstr "" #: templates/web/default/admin/index.html:36 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:20 -#: templates/web/default/dashboard/index.html:136 #: templates/web/default/dashboard/index.html:138 -#: templates/web/default/report/display.html:79 -#: templates/web/default/report/display.html:81 +#: templates/web/default/dashboard/index.html:140 +#: templates/web/default/report/update-form.html:30 +#: templates/web/default/report/update-form.html:32 #: templates/web/fixmystreet/report/banner.html:12 -#: templates/web/fixmystreet/report/display.html:74 -#: templates/web/fixmystreet/report/display.html:76 +#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/fixmystreet/report/update-form.html:30 msgid "Fixed" msgstr "Løst" @@ -1055,7 +1076,7 @@ msgstr "Løst - Administrasjon" msgid "Fixed - User" msgstr "Løst - Bruker" -#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:27 +#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:31 msgid "Fixed reports" msgstr "Fiksede rapporter" @@ -1067,6 +1088,7 @@ msgstr "Løst:" msgid "Flag user" msgstr "Flag bruker" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1037 #: templates/web/default/admin/search_users.html:15 msgid "Flagged" msgstr "Flagget:" @@ -1077,7 +1099,7 @@ msgid "Flagged:" msgstr "Flagget:" #: templates/web/default/reports/_ward-list.html:3 -#: templates/web/emptyhomes/reports/council.html:19 +#: templates/web/emptyhomes/reports/body.html:19 #: templates/web/fixmystreet/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "Følg en bydelslenke for å kun se rapporter innenfor den bydelen." @@ -1086,11 +1108,18 @@ msgstr "Følg en bydelslenke for å kun se rapporter innenfor den bydelen." msgid "For council(s):" msgstr "For administrasjon(ene):" +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:186 +#: templates/web/fixmystreet/report/update-form.html:102 +#, fuzzy +msgid "Forgotten your password?" +msgstr "Ditt passord" + #: templates/web/default/faq/faq-en-gb.html:1 #: templates/web/emptyhomes/faq/faq-cy.html:1 #: templates/web/emptyhomes/faq/faq-en-gb.html:1 #: templates/web/fiksgatami/faq/faq-nb.html:1 #: templates/web/fiksgatami/nn/faq/faq-nn.html:1 +#: templates/web/fixmybarangay/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/static/privacy.html:1 #: templates/web/zurich/faq/faq-de.html:1 @@ -1106,7 +1135,7 @@ msgid "GeoRSS on Google Maps" msgstr "GeoRSS på Google Maps" #: templates/web/bromley/report/display.html:30 -#: templates/web/fixmystreet/report/display.html:23 +#: templates/web/fixmystreet/report/display.html:31 msgid "Get updates" msgstr "Få oppdateringer" @@ -1121,6 +1150,7 @@ msgid "Get updates of problems in this %s" msgstr "Få oppdateringer for problemer i denne %s" #: templates/web/default/alert/_list.html:83 +#: templates/web/fixmybarangay/alert/_list.html:28 #: templates/web/fixmystreet/alert/_list.html:82 msgid "Give me an RSS feed" msgstr "Gi meg en RSS-strøm" @@ -1128,7 +1158,7 @@ msgstr "Gi meg en RSS-strøm" #: templates/web/default/alert/index.html:34 #: templates/web/default/around/postcode_form.html:8 #: templates/web/emptyhomes/index.html:47 -#: templates/web/fixmystreet/around/postcode_form.html:18 +#: templates/web/fixmystreet/around/postcode_form.html:21 msgid "Go" msgstr "Fortsett" @@ -1165,8 +1195,10 @@ msgstr "" #: templates/web/emptyhomes/header.html:28 #: templates/web/fiksgatami/footer.html:9 #: templates/web/fiksgatami/nn/footer.html:9 +#: templates/web/fixmybarangay/footer.html:24 #: templates/web/fixmystreet/footer.html:53 -#: templates/web/reading/footer.html:10 +#: templates/web/reading/footer.html:10 templates/web/stevenage/footer.html:47 +#: templates/web/zurich/footer.html:14 msgid "Help" msgstr "Hjelp" @@ -1178,9 +1210,9 @@ msgstr "" #: templates/web/barnet/header.html:70 templates/web/bromley/header.html:64 #: templates/web/bromley/header.html:99 -#: templates/web/fixmybarangay/header.html.orig:42 -#: templates/web/fixmystreet/header.html:47 -#: templates/web/zurich/header.html:47 +#: templates/web/fixmybarangay/header.html:64 +#: templates/web/fixmystreet/header.html:49 +#: templates/web/stevenage/header.html:97 templates/web/zurich/header.html:47 msgid "Hi %s" msgstr "Hei, %s" @@ -1190,26 +1222,24 @@ msgstr "Hei, %s" msgid "Hidden" msgstr "Skjul" -#: templates/web/default/around/display_location.html:58 -#: templates/web/fixmystreet/around/display_location.html:58 +#: templates/web/default/around/display_location.html:63 msgid "Hide old" msgstr "Skjul gamle" -#: templates/web/default/around/display_location.html:53 -#: templates/web/fixmystreet/around/display_location.html:54 +#: templates/web/default/around/display_location.html:58 msgid "Hide pins" msgstr "Skjul nåler" -#: templates/web/default/admin/council_edit.html:38 +#: templates/web/default/admin/council_edit.html:66 msgid "History" msgstr "Historie" -#: templates/web/default/index.html:28 templates/web/emptyhomes/index.html:53 -#: templates/web/fixmystreet/index.html:36 +#: templates/web/default/index-steps.html:1 +#: templates/web/emptyhomes/index.html:53 msgid "How to report a problem" msgstr "Hvordan rapportere et problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:637 +#: perllib/FixMyStreet/App/Controller/Admin.pm:648 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Jeg er redd du ikke kan bekrefte ubekreftede rapporter." @@ -1294,12 +1324,12 @@ msgstr "Ugyldig valg av feed" #: templates/web/bromley/report/display.html:82 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:20 -#: templates/web/default/dashboard/index.html:136 #: templates/web/default/dashboard/index.html:138 -#: templates/web/default/report/display.html:79 -#: templates/web/default/report/display.html:81 -#: templates/web/fixmystreet/report/display.html:74 -#: templates/web/fixmystreet/report/display.html:76 +#: templates/web/default/dashboard/index.html:140 +#: templates/web/default/report/update-form.html:30 +#: templates/web/default/report/update-form.html:32 +#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/fixmystreet/report/update-form.html:30 msgid "In Progress" msgstr "Under arbeid" @@ -1331,7 +1361,7 @@ msgstr "Feil has_photo-verdi \"%s\"" msgid "Invalid agency_responsible value %s" msgstr "Ugyldig agency_responsible-verdi %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:952 msgid "Invalid end date" msgstr "Ugyldig slutt-dato" @@ -1339,7 +1369,7 @@ msgstr "Ugyldig slutt-dato" msgid "Invalid format %s specified." msgstr "Ugyldig format %s oppgitt." -#: perllib/FixMyStreet/App/Controller/Admin.pm:932 +#: perllib/FixMyStreet/App/Controller/Admin.pm:942 msgid "Invalid start date" msgstr "Ugyldig startdato" @@ -1347,12 +1377,12 @@ msgstr "Ugyldig startdato" #: templates/web/bromley/report/display.html:81 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/dashboard/index.html:136 -#: templates/web/default/dashboard/index.html:137 -#: templates/web/default/report/display.html:79 -#: templates/web/default/report/display.html:80 -#: templates/web/fixmystreet/report/display.html:74 -#: templates/web/fixmystreet/report/display.html:75 +#: templates/web/default/dashboard/index.html:138 +#: templates/web/default/dashboard/index.html:139 +#: templates/web/default/report/update-form.html:30 +#: templates/web/default/report/update-form.html:31 +#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/fixmystreet/report/update-form.html:29 msgid "Investigating" msgstr "Undersøkes" @@ -1372,11 +1402,11 @@ msgstr "" #: templates/web/bromley/report/display.html:166 #: templates/web/bromley/report/new/fill_in_details_form.html:209 #: templates/web/default/auth/general.html:44 -#: templates/web/default/report/display.html:151 #: templates/web/default/report/new/fill_in_details_form.html:149 -#: templates/web/fixmystreet/auth/general.html:42 -#: templates/web/fixmystreet/report/display.html:144 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:167 +#: templates/web/default/report/update-form.html:102 +#: templates/web/fixmystreet/auth/general.html:46 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:182 +#: templates/web/fixmystreet/report/update-form.html:98 msgid "Keep me signed in on this computer" msgstr "Husk min innlogging på denne datamaskinen" @@ -1386,7 +1416,7 @@ msgstr "Husk min innlogging på denne datamaskinen" msgid "Last Name" msgstr "Etternavn" -#: templates/web/default/admin/council_contacts.html:39 +#: templates/web/default/admin/council_contacts.html:42 msgid "Last editor" msgstr "Sist redigert av" @@ -1398,18 +1428,15 @@ msgstr "Siste oppdatering:" msgid "Last update:" msgstr "Siste oppdatering:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1028 -msgid "List Flagged" -msgstr "List flagget" - -#: templates/web/default/admin/council_contacts.html:14 #: templates/web/default/admin/council_contacts.html:16 +#: templates/web/default/admin/council_contacts.html:18 msgid "List all reported problems" msgstr "List alle rapporterte problemer" #: templates/web/bromley/report/new/fill_in_details_form.html:69 #: templates/web/default/report/new/fill_in_details_form.html:68 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:75 +#: templates/web/zurich/report/new/fill_in_details_form.html:69 msgid "Loading..." msgstr "Laster..." @@ -1424,6 +1451,8 @@ msgstr "Laster..." #: templates/web/default/tokens/confirm_alert.html:3 #: templates/web/emptyhomes/alert/index.html:1 #: templates/web/emptyhomes/alert/index.html:3 +#: templates/web/fixmybarangay/alert/index.html:1 +#: templates/web/fixmybarangay/alert/index.html:3 #: templates/web/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "Lokal RSS-strøm og e-postvarsel" @@ -1439,13 +1468,14 @@ msgstr "Lokal RSS-strøm og e-postvarsel for ‘%s’" #: templates/web/bromley/header.html:79 templates/web/default/footer.html:13 #: templates/web/fiksgatami/footer.html:8 #: templates/web/fiksgatami/nn/footer.html:8 +#: templates/web/fixmybarangay/footer.html:22 #: templates/web/fixmystreet/footer.html:51 -#: templates/web/reading/footer.html:9 +#: templates/web/reading/footer.html:9 templates/web/stevenage/footer.html:45 msgid "Local alerts" msgstr "Lokale varsler" -#: templates/web/default/index.html:32 templates/web/emptyhomes/index.html:57 -#: templates/web/fixmystreet/index.html:40 +#: templates/web/default/index-steps.html:10 +#: templates/web/emptyhomes/index.html:57 msgid "Locate the problem on a map of the area" msgstr "Lokaliser problemet på kartet over området" @@ -1488,10 +1518,12 @@ msgstr "Flere problemer i nærheten" #: templates/web/emptyhomes/reports/index.html:10 #: templates/web/fiksgatami/nn/reports/index.html:9 #: templates/web/fiksgatami/reports/index.html:9 -#: templates/web/fixmystreet/auth/general.html:52 -#: templates/web/fixmystreet/report/display.html:177 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:117 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:176 +#: templates/web/fixmybarangay/reports/index.html:19 +#: templates/web/fixmystreet/auth/general.html:56 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:120 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:197 +#: templates/web/fixmystreet/report/update-form.html:134 +#: templates/web/zurich/report/new/fill_in_details_form.html:118 msgid "Name" msgstr "Navn" @@ -1507,7 +1539,7 @@ msgstr "Navn:" msgid "Navigation" msgstr "Navigasjon" -#: perllib/FixMyStreet/Geocode/OSM.pm:159 +#: perllib/FixMyStreet/Geocode/OSM.pm:166 msgid "" "Nearest named road to the pin placed on the map (automatically generated " "using OpenStreetMap): %s%s" @@ -1515,7 +1547,7 @@ msgstr "" "Nærmeste navngitte vei til nålen plassert på kartet (automatisk generert ved " "hjelp av OpenStreetMap): %s%s" -#: perllib/FixMyStreet/Cobrand/UK.pm:161 +#: perllib/FixMyStreet/Cobrand/UK.pm:152 msgid "" "Nearest postcode to the pin placed on the map (automatically generated): %s " "(%sm away)" @@ -1523,8 +1555,8 @@ msgstr "" "Nærmeste postnummer til nålen plassert på kartet (automatisk generert): %s " "(%sm unna)" -#: perllib/FixMyStreet/Cobrand/Default.pm:404 -#: perllib/FixMyStreet/Cobrand/Default.pm:444 +#: perllib/FixMyStreet/Cobrand/Default.pm:407 +#: perllib/FixMyStreet/Cobrand/Default.pm:447 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing " "Maps): %s" @@ -1532,7 +1564,7 @@ msgstr "" "Nærmeste vei til nålen plassert på kartet (automatisk generert ved hjelp av " "Bing Maps): %s" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:245 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:265 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing " "Maps): %s\n" @@ -1547,10 +1579,11 @@ msgid "Nearly Done! Now check your email..." msgstr "Nesten ferdig! Nå må du sjekke e-posten din..." #: templates/web/default/reports/index.html:16 +#: templates/web/fixmybarangay/reports/index.html:20 msgid "New <br>problems" msgstr "Nye <br>problemer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:314 +#: perllib/FixMyStreet/App/Controller/Admin.pm:320 msgid "New category contact added" msgstr "Ny kategorikontakt lagt til" @@ -1620,8 +1653,9 @@ msgstr "Ny tilstand" msgid "New!" msgstr "Ny!" -#: templates/web/default/admin/council_contacts.html:48 -#: templates/web/default/admin/council_contacts.html:49 +#: templates/web/default/admin/council_contacts.html:52 +#: templates/web/default/admin/council_contacts.html:53 +#: templates/web/default/admin/council_contacts.html:54 #: templates/web/default/admin/council_edit.html:4 #: templates/web/default/admin/list_updates.html:30 #: templates/web/default/admin/list_updates.html:31 @@ -1643,7 +1677,7 @@ msgstr "Nei" msgid "No council" msgstr "Ingen administrasjon" -#: perllib/FixMyStreet/DB/Result/Problem.pm:328 +#: perllib/FixMyStreet/DB/Result/Problem.pm:336 msgid "No council selected" msgstr "Ingen administrasjon er valgt" @@ -1673,6 +1707,14 @@ msgstr "Ingen problemer ble funnet." msgid "No problems have been reported yet." msgstr "Ingen problemer er rapportert" +#: templates/web/default/report/_support.html:3 +msgid "No supporters" +msgstr "" + +#: templates/web/default/admin/council_contacts.html:57 +msgid "Non Public" +msgstr "" + #: templates/web/default/admin/council_list.html:5 #: templates/web/default/admin/report_edit.html:16 msgid "None" @@ -1682,14 +1724,13 @@ msgstr "Ingen" msgid "Not reported before" msgstr "Ikke rapportert tidligere" -#: templates/web/default/report/_main.html:11 +#: templates/web/default/report/_main.html:14 #: templates/web/emptyhomes/report/display.html:24 -#: templates/web/fixmystreet/report/_main.html:13 msgid "Not reported to council" msgstr "Ikke rapportert til administrasjonen" -#: templates/web/default/admin/council_contacts.html:40 -#: templates/web/default/admin/council_edit.html:46 +#: templates/web/default/admin/council_contacts.html:43 +#: templates/web/default/admin/council_edit.html:74 msgid "Note" msgstr "Merk" @@ -1703,8 +1744,8 @@ msgstr "" "opprettet, hvilket ikke trenger være den samme måneden som rapporten var " "bekreftet, så tallene kan hoppe litt opp og ned." -#: templates/web/default/admin/council_contacts.html:89 -#: templates/web/default/admin/council_edit.html:31 +#: templates/web/default/admin/council_contacts.html:95 +#: templates/web/default/admin/council_edit.html:32 msgid "Note:" msgstr "Merk:" @@ -1712,7 +1753,7 @@ msgstr "Merk:" msgid "Note: <strong>%s</strong>" msgstr "Note: <strong>%d</strong>" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:149 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:164 msgid "Now to submit your report…" msgstr "På tide å sende din rapport…" @@ -1720,11 +1761,11 @@ msgstr "På tide å sende din rapport…" msgid "Now to submit your report… do you have a FixMyStreet password?" msgstr "På tide å sende din rapport… har du et FiksGataMi-passord?" -#: templates/web/fixmystreet/report/display.html:127 +#: templates/web/fixmystreet/report/update-form.html:81 msgid "Now to submit your update…" msgstr "På tide å registrere din oppdatering…" -#: templates/web/default/report/display.html:133 +#: templates/web/default/report/update-form.html:84 msgid "Now to submit your update… do you have a FixMyStreet password?" msgstr "" "På tide å registrere din oppdatering… har du et FiksGataMi-passord?" @@ -1735,6 +1776,7 @@ msgid "Offensive? Unsuitable? Tell us" msgstr "Støtende? Upassende? Gi oss beskjed" #: templates/web/default/reports/index.html:18 +#: templates/web/fixmybarangay/reports/index.html:22 msgid "Old / unknown <br>problems" msgstr "Gamle / ukjente <br>problemer" @@ -1748,10 +1790,12 @@ msgid "Old state" msgstr "Gammel tilstand" #: templates/web/default/reports/index.html:20 +#: templates/web/fixmybarangay/reports/index.html:24 msgid "Older <br>fixed" msgstr "Eldre <br>løste" #: templates/web/default/reports/index.html:17 +#: templates/web/fixmybarangay/reports/index.html:21 msgid "Older <br>problems" msgstr "Eldre <br>problemer" @@ -1770,13 +1814,13 @@ msgstr "Eldre problemer" #: templates/web/bromley/report/display.html:80 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/update_edit.html:19 -#: templates/web/default/dashboard/index.html:136 -#: templates/web/default/report/display.html:79 -#: templates/web/fixmystreet/report/display.html:74 +#: templates/web/default/dashboard/index.html:138 +#: templates/web/default/report/update-form.html:30 +#: templates/web/fixmystreet/report/update-form.html:28 msgid "Open" msgstr "Åpen" -#: templates/web/default/my/my.html:22 templates/web/fixmystreet/my/my.html:22 +#: templates/web/default/my/my.html:22 templates/web/fixmystreet/my/my.html:26 msgid "Open reports" msgstr "Åpne rapporter" @@ -1806,15 +1850,15 @@ msgstr "" "Eller du kan abonnere på varsel basert på bydel eller administrasjon du " "hører inn under:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:655 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1006 #: perllib/FixMyStreet/App/Controller/Report/New.pm:656 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:497 -#: perllib/FixMyStreet/DB/Result/Problem.pm:507 -#: perllib/FixMyStreet/DB/Result/Problem.pm:517 -#: perllib/FixMyStreet/DB/Result/Problem.pm:529 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:329 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:338 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:657 +#: perllib/FixMyStreet/DB/Result/Problem.pm:505 +#: perllib/FixMyStreet/DB/Result/Problem.pm:515 +#: perllib/FixMyStreet/DB/Result/Problem.pm:525 +#: perllib/FixMyStreet/DB/Result/Problem.pm:537 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:331 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:340 msgid "Other" msgstr "Annet" @@ -1842,9 +1886,9 @@ msgstr "Delvis" #: templates/web/bromley/report/display.html:145 #: templates/web/bromley/report/new/fill_in_details_form.html:186 -#: templates/web/fixmystreet/auth/general.html:55 -#: templates/web/fixmystreet/report/display.html:157 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:197 +#: templates/web/fixmystreet/auth/general.html:59 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:218 +#: templates/web/fixmystreet/report/update-form.html:117 msgid "Password (optional)" msgstr "Passord (valgfritt)" @@ -1854,12 +1898,13 @@ msgstr "Passord:" #: templates/web/bromley/report/new/fill_in_details_form.html:136 #: templates/web/bromley/report/new/fill_in_details_form.html:183 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:133 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:194 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:148 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:215 +#: templates/web/zurich/report/new/fill_in_details_form.html:124 msgid "Phone number (optional)" msgstr "Telefonnummer (valgfritt)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:260 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:262 #: templates/web/default/admin/report_edit.html:32 #: templates/web/default/report/new/fill_in_details_form.html:215 msgid "Phone:" @@ -1867,14 +1912,15 @@ msgstr "Telefon:" #: templates/web/bromley/report/display.html:109 #: templates/web/bromley/report/new/fill_in_details_form.html:104 -#: templates/web/fixmystreet/report/display.html:103 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:108 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:92 +#: templates/web/fixmystreet/report/update-form.html:57 +#: templates/web/zurich/report/new/fill_in_details_form.html:86 msgid "Photo" msgstr "Bilde" #: templates/web/default/questionnaire/index.html:95 -#: templates/web/default/report/display.html:109 #: templates/web/default/report/new/fill_in_details_form.html:102 +#: templates/web/default/report/update-form.html:60 #: templates/web/fixmystreet/questionnaire/index.html:90 msgid "Photo:" msgstr "Bilde:" @@ -1887,12 +1933,12 @@ msgstr "Bilder av nye problemer i nærheten" #: templates/web/bromley/report/display.html:81 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/dashboard/index.html:136 -#: templates/web/default/dashboard/index.html:137 -#: templates/web/default/report/display.html:79 -#: templates/web/default/report/display.html:80 -#: templates/web/fixmystreet/report/display.html:74 -#: templates/web/fixmystreet/report/display.html:75 +#: templates/web/default/dashboard/index.html:138 +#: templates/web/default/dashboard/index.html:139 +#: templates/web/default/report/update-form.html:30 +#: templates/web/default/report/update-form.html:31 +#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/fixmystreet/report/update-form.html:29 msgid "Planned" msgstr "Planlagt" @@ -1925,16 +1971,16 @@ msgstr "Vennligst sjekk e-posten du oppgav" msgid "Please check your email address is correct" msgstr "Vennligst sjekk at du har skrevet en gyldig e-postadresse" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:819 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:826 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:845 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:884 -#: perllib/FixMyStreet/DB/Result/Problem.pm:347 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:822 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:829 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:848 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:891 +#: perllib/FixMyStreet/DB/Result/Problem.pm:355 #: templates/web/default/js/validation_strings.html:9 msgid "Please choose a category" msgstr "Velg en kategori" -#: perllib/FixMyStreet/DB/Result/Problem.pm:353 +#: perllib/FixMyStreet/DB/Result/Problem.pm:361 msgid "Please choose a property type" msgstr "Velg en type egenskap" @@ -1961,9 +2007,10 @@ msgstr "" #: templates/web/default/report/new/notes.html:7 #: templates/web/fixmystreet/report/new/notes.html:6 +#, fuzzy msgid "" -"Please do not be abusive — abusing your council devalues the service " -"for all users." +"Please do not be abusive — abusing your council devalues the " +"service for all users." msgstr "" "Ikke vær ufin — å kjefte på din administrasjon skader verdien av " "tjenesten for alle brukerne." @@ -1979,7 +2026,7 @@ msgid "Please enter a password" msgstr "Skriv inn et passord" #: perllib/FixMyStreet/App/Controller/Contact.pm:97 -#: perllib/FixMyStreet/DB/Result/Problem.pm:322 +#: perllib/FixMyStreet/DB/Result/Problem.pm:330 #: templates/web/default/js/validation_strings.html:3 msgid "Please enter a subject" msgstr "Vennligst legg inn et emne" @@ -1995,7 +2042,7 @@ msgstr "Legg til en gyldig e-post" msgid "Please enter a valid email address" msgstr "Legg inn din e-post" -#: perllib/FixMyStreet/DB/Result/Problem.pm:325 +#: perllib/FixMyStreet/DB/Result/Problem.pm:333 #: templates/web/default/js/validation_strings.html:4 msgid "Please enter some details" msgstr "Legg inn opplysninger om problemet" @@ -2012,7 +2059,8 @@ msgid "Please enter your email" msgstr "Legg inn din e-post" #: templates/web/bromley/report/new/fill_in_details_form.html:149 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:146 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:161 +#: templates/web/zurich/report/new/fill_in_details_form.html:110 msgid "Please enter your email address" msgstr "Vennligst tast inn din e-postadresse" @@ -2020,7 +2068,7 @@ msgstr "Vennligst tast inn din e-postadresse" msgid "Please enter your first name" msgstr "Vennligst tast inn ditt fornavn" -#: perllib/FixMyStreet/DB/Result/Problem.pm:340 +#: perllib/FixMyStreet/DB/Result/Problem.pm:348 #: templates/web/default/js/validation_strings.html:7 msgid "" "Please enter your full name, councils need this information – if you do not " @@ -2032,7 +2080,7 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:95 #: perllib/FixMyStreet/DB/Result/Comment.pm:143 -#: perllib/FixMyStreet/DB/Result/Problem.pm:333 +#: perllib/FixMyStreet/DB/Result/Problem.pm:341 #: perllib/FixMyStreet/DB/Result/User.pm:97 #: templates/web/default/js/validation_strings.html:6 msgid "Please enter your name" @@ -2061,11 +2109,29 @@ msgstr "" #: templates/web/default/report/new/fill_in_details_text.html:1 #: templates/web/default/report/new/fill_in_details_text.html:11 +#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1 +#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 -#: templates/web/fixmystreet/report/new/fill_in_details_text.html:11 +#: templates/web/fixmystreet/report/new/fill_in_details_text.html:8 msgid "Please fill in details of the problem below." msgstr "Vennligst fyll ut detaljer om problemet under" +#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1 +#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:3 +#, fuzzy +msgid "" +"Please fill in details of the problem below. Leave as much detail as you " +"can, \n" +"and if possible describe the exact location of\n" +"the problem (e.g. if there is a streetlight number or road name)." +msgstr "" +"Vennligst fyll inn detaljene om problemet under. Administrasjonen vil ikke " +"være i stand\n" +"til å hjelpe med mindre du legger inn så mange detaljer som du kan. Beskriv\n" +"eksakt plassering for problemet (f.eks. på en vegg), hva det er, hvor lenge " +"det har\n" +"vært der, en beskrivelse (og et bilde av problemet hvis du har et), osv." + #: templates/web/default/report/new/fill_in_details_text.html:1 #: templates/web/default/report/new/fill_in_details_text.html:3 msgid "" @@ -2083,13 +2149,15 @@ msgstr "" "det har\n" "vært der, en beskrivelse (og et bilde av problemet hvis du har et), osv." -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:68 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:70 +#: templates/web/zurich/report/new/fill_in_details_form.html:64 msgid "Please fill in details of the problem." msgstr "Vennligst fyll ut detaljer om problemet." #: templates/web/bromley/report/new/fill_in_details_form.html:28 #: templates/web/default/report/new/fill_in_details_form.html:27 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:34 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:35 +#: templates/web/zurich/report/new/fill_in_details_form.html:35 msgid "" "Please fill in the form below with details of the problem, and describe the " "location as precisely as possible in the details box." @@ -2097,7 +2165,7 @@ msgstr "" "Vennligst fyll inn skjemaet under med detaljene om problemet,\n" "og beskriv plasseringen så nøyaktig som mulig i boksen for detaljer." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Vennligst indiker om du ønsker å motta et nytt spørreskjema" @@ -2107,7 +2175,7 @@ msgstr "" "Vær oppmerksom på at oppdaterginger ikke blir videresendt til " "administrasjonen." -#: templates/web/default/report/display.html:56 +#: templates/web/default/report/update-form.html:7 msgid "" "Please note that updates are not sent to the council. If you leave your name " "it will be public. Your information will only be used in accordance with our " @@ -2131,7 +2199,8 @@ msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:23 #: templates/web/default/report/new/fill_in_details_form.html:5 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:25 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:26 +#: templates/web/zurich/report/new/fill_in_details_form.html:26 msgid "" "Please note your report has <strong>not yet been sent</strong>. Choose a " "category and add further information below, then submit." @@ -2140,22 +2209,23 @@ msgstr "" "legg til mer informasjon under før du sender inn." #: templates/web/default/report/new/notes.html:1 +#: templates/web/fixmybarangay/report/new/notes.html:1 #: templates/web/fixmystreet/report/new/notes.html:1 msgid "Please note:" msgstr "Vennligst merk deg:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:244 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:246 msgid "Please provide some explanation as to why you're reopening this report" msgstr "" "Vennligst bidra med en forklaring for hvorfor du gjenåpner denne " "problemrapporten" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:251 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 msgid "Please provide some text as well as a photo" msgstr "Vennligst bidra med litt tekst i tilegg til et bilde" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:237 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239 msgid "" "Please say whether you've ever reported a problem to your council before" msgstr "" @@ -2170,7 +2240,7 @@ msgstr "Velg den kilden du ønsker" msgid "Please select the type of alert you want" msgstr "Vennligst velg hvilken type varsel du ønsker" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:233 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235 msgid "Please state whether or not the problem has been fixed" msgstr "Vennligs oppgi om dette problemet er blitt fikset eller ikke" @@ -2178,11 +2248,11 @@ msgstr "Vennligs oppgi om dette problemet er blitt fikset eller ikke" msgid "Please take a look at the updates that have been left." msgstr "Vennligst se over oppdateringene som har blitt lagt inn." -#: perllib/FixMyStreet/App/Controller/Photo.pm:176 +#: perllib/FixMyStreet/App/Controller/Photo.pm:175 msgid "Please upload a JPEG image only" msgstr "Vennligst last opp kun JPEG-bilder" -#: perllib/FixMyStreet/App/Controller/Photo.pm:183 +#: perllib/FixMyStreet/App/Controller/Photo.pm:182 msgid "Please upload a JPEG image only\n" msgstr "Vennligst last opp kun JPEG eller JPG-bilder\n" @@ -2191,7 +2261,7 @@ msgid "Please write a message" msgstr "Skriv inn en melding" #: templates/web/bromley/report/display.html:70 -#: templates/web/fixmystreet/report/display.html:69 +#: templates/web/fixmystreet/report/update-form.html:23 msgid "Please write your update here" msgstr "Vennligst skriv inn din oppdatering her" @@ -2199,13 +2269,13 @@ msgstr "Vennligst skriv inn din oppdatering her" #: templates/web/bromley/report/display.html:149 #: templates/web/bromley/report/display.html:161 #: templates/web/default/contact/index.html:93 -#: templates/web/default/report/display.html:119 -#: templates/web/default/report/display.html:156 -#: templates/web/default/report/display.html:178 +#: templates/web/default/report/update-form.html:107 +#: templates/web/default/report/update-form.html:129 +#: templates/web/default/report/update-form.html:70 #: templates/web/fixmystreet/contact/index.html:93 -#: templates/web/fixmystreet/report/display.html:115 -#: templates/web/fixmystreet/report/display.html:139 -#: templates/web/fixmystreet/report/display.html:161 +#: templates/web/fixmystreet/report/update-form.html:121 +#: templates/web/fixmystreet/report/update-form.html:69 +#: templates/web/fixmystreet/report/update-form.html:93 msgid "Post" msgstr "Send inn" @@ -2221,6 +2291,12 @@ msgstr "Lagt inn av %s (<strong>%s</strong>) %s" msgid "Posted by %s at %s" msgstr "Sendt inn av %s %s" +#: templates/web/default/admin/council_contacts.html:100 +#: templates/web/default/admin/council_edit.html:30 +#: templates/web/default/admin/report_edit.html:43 +msgid "Private" +msgstr "" + #: templates/web/default/maps/openlayers.html:85 msgid "Problem" msgstr "Problem" @@ -2241,7 +2317,7 @@ msgstr "Problem %s sendt til administrasjon %s" msgid "Problem breakdown by state" msgstr "Tilstandsfordeling av problemer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:819 +#: perllib/FixMyStreet/App/Controller/Admin.pm:849 msgid "Problem marked as open." msgstr "Problem markert som åpent." @@ -2253,17 +2329,17 @@ msgstr "Problemtilstandsendring basert på spørreundersøkelsesresultater" msgid "Problems" msgstr "Problemer" -#: templates/web/default/around/display_location.html:81 +#: templates/web/default/around/_updates.html:1 msgid "Problems in this area" msgstr "Problemer i dette området" #: templates/web/bromley/report/display.html:31 -#: templates/web/fixmystreet/around/display_location.html:98 -#: templates/web/fixmystreet/report/display.html:24 +#: templates/web/fixmystreet/around/tabbed_lists.html:4 +#: templates/web/fixmystreet/report/display.html:35 msgid "Problems nearby" msgstr "Problemer i nærheten" -#: templates/web/fixmystreet/around/display_location.html:97 +#: templates/web/fixmystreet/around/tabbed_lists.html:3 msgid "Problems on the map" msgstr "Problemer på kartet" @@ -2276,24 +2352,25 @@ msgstr "Problemer nylig rapportert fikset på FiksGataMi" msgid "Problems within %.1fkm of this location" msgstr "Problemer innenfor %.1fkm av denne posisjonen" -#: perllib/FixMyStreet/Cobrand/Default.pm:609 +#: perllib/FixMyStreet/Cobrand/Default.pm:612 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:95 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:162 -#: perllib/FixMyStreet/Cobrand/UK.pm:240 +#: perllib/FixMyStreet/Cobrand/UK.pm:231 msgid "Problems within %s" msgstr "Problemer innenfor %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:103 -#: perllib/FixMyStreet/Cobrand/UK.pm:254 +#: perllib/FixMyStreet/Cobrand/UK.pm:245 msgid "Problems within %s ward" msgstr "Problemer innenfor %s bydel" -#: templates/web/default/reports/council.html:0 -#: templates/web/default/reports/council.html:29 +#: templates/web/default/reports/body.html:0 +#: templates/web/default/reports/body.html:29 msgid "Problems within %s, FixMyStreet" msgstr "Problemer innenfor %s, Fiksgatami" #: templates/web/default/alert/_list.html:40 +#: templates/web/fixmybarangay/alert/_list.html:13 #: templates/web/fixmystreet/alert/_list.html:42 msgid "Problems within the boundary of:" msgstr "Problemer innenfor grensene av:" @@ -2303,18 +2380,18 @@ msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "" "Eiendommer nylig rapportert som gått tilbake i bruk på reportemptyhomes.com" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:617 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:616 msgid "Property type:" msgstr "Type egenskap:" #: templates/web/bromley/report/new/fill_in_details_form.html:52 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:62 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:64 msgid "Provide a title" msgstr "Oppgi en tittel" #: templates/web/bromley/report/display.html:57 -#: templates/web/default/report/display.html:51 -#: templates/web/fixmystreet/report/display.html:50 +#: templates/web/default/report/update-form.html:3 +#: templates/web/fixmystreet/report/update-form.html:4 msgid "Provide an update" msgstr "Bidra med en oppdatering" @@ -2328,10 +2405,10 @@ msgstr "" "over dine rapporter." #: templates/web/bromley/report/display.html:142 -#: templates/web/default/report/display.html:175 #: templates/web/default/report/new/fill_in_details_form.html:173 -#: templates/web/fixmystreet/report/display.html:154 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:191 +#: templates/web/default/report/update-form.html:126 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:212 +#: templates/web/fixmystreet/report/update-form.html:114 msgid "" "Providing a password is optional, but doing so will allow you to more easily " "report problems, leave updates and manage your reports." @@ -2340,6 +2417,11 @@ msgstr "" "for deg å rapportere problemer, legge inn oppdateringer og holde oversikt " "over dine rapporter" +#: templates/web/default/admin/council_contacts.html:44 +#: templates/web/default/admin/council_contacts.html:57 +msgid "Public" +msgstr "" + #: templates/web/default/questionnaire/completed.html:1 #: templates/web/default/questionnaire/completed.html:2 #: templates/web/default/questionnaire/index.html:0 @@ -2360,7 +2442,7 @@ msgstr "Spørreskjema %d fylt inn for problem %d, %s til %s" msgid "Questionnaire %d sent for problem %d" msgstr "Spørreskjema %d sendt for problem %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:190 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "Spørreskjema fylt inn av feilrapportøren" @@ -2372,17 +2454,15 @@ msgstr "Spørreskjema fylt inn av feilrapportøren" #: templates/web/default/reports/_rss.html:1 #: templates/web/fixmystreet/alert/_list.html:22 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/around/display_location.html:1 -#: templates/web/fixmystreet/around/display_location.html:3 -#: templates/web/fixmystreet/report/display.html:30 +#: templates/web/fixmystreet/report/display.html:49 msgid "RSS feed" msgstr "RSS-strøm" -#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 +#: perllib/FixMyStreet/Cobrand/UK.pm:274 perllib/FixMyStreet/Cobrand/UK.pm:286 msgid "RSS feed for %s" msgstr "RSS-strøm for %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:289 perllib/FixMyStreet/Cobrand/UK.pm:301 +#: perllib/FixMyStreet/Cobrand/UK.pm:280 perllib/FixMyStreet/Cobrand/UK.pm:292 msgid "RSS feed for %s ward, %s" msgstr "RSS-strøm for %s bydel, %s" @@ -2390,11 +2470,11 @@ msgstr "RSS-strøm for %s bydel, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:186 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:196 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:204 -#: perllib/FixMyStreet/Cobrand/UK.pm:309 perllib/FixMyStreet/Cobrand/UK.pm:321 +#: perllib/FixMyStreet/Cobrand/UK.pm:300 perllib/FixMyStreet/Cobrand/UK.pm:312 msgid "RSS feed of %s" msgstr "RSS-strøm fra %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:314 perllib/FixMyStreet/Cobrand/UK.pm:326 +#: perllib/FixMyStreet/Cobrand/UK.pm:305 perllib/FixMyStreet/Cobrand/UK.pm:317 msgid "RSS feed of %s, within %s ward" msgstr "RSS-strøm av %s, innenfor %s bydel" @@ -2407,29 +2487,27 @@ msgstr "RSS-strøm med problemer i nærheten" msgid "RSS feed of problems in this %s" msgstr "RSS-strøm for problemer i denne %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:610 +#: perllib/FixMyStreet/Cobrand/Default.pm:613 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:96 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161 -#: perllib/FixMyStreet/Cobrand/UK.pm:247 +#: perllib/FixMyStreet/Cobrand/UK.pm:238 msgid "RSS feed of problems within %s" msgstr "RSS-strøm for problemer innenfor %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:102 -#: perllib/FixMyStreet/Cobrand/UK.pm:253 +#: perllib/FixMyStreet/Cobrand/UK.pm:244 msgid "RSS feed of problems within %s ward" msgstr "RSS-strøm for problemer innenfor %s bydel" #: templates/web/default/around/display_location.html:1 #: templates/web/default/around/display_location.html:4 -#: templates/web/fixmystreet/around/display_location.html:1 -#: templates/web/fixmystreet/around/display_location.html:4 msgid "RSS feed of recent local problems" msgstr "RSS-strøm med nylige lokale problemer" #: templates/web/bromley/report/display.html:37 #: templates/web/default/report/display.html:42 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:30 +#: templates/web/fixmystreet/report/display.html:49 msgid "RSS feed of updates to this problem" msgstr "RSS-strøm med oppdateringer for dette problemet" @@ -2437,18 +2515,17 @@ msgstr "RSS-strøm med oppdateringer for dette problemet" #: templates/web/default/alert/updates.html:9 #: templates/web/default/report/display.html:33 #: templates/web/fixmystreet/alert/updates.html:14 -#: templates/web/fixmystreet/report/display.html:32 +#: templates/web/fixmystreet/report/display.html:51 msgid "Receive email when updates are left on this problem." msgstr "Motta e-post når det er oppdateringer på dette problemet" #: templates/web/default/around/display_location.html:0 #: templates/web/default/around/display_location.html:34 -#: templates/web/fixmystreet/around/display_location.html:0 -#: templates/web/fixmystreet/around/display_location.html:34 msgid "Recent local problems, FixMyStreet" msgstr "Nylige lokale problemer, FiksGataMi." #: templates/web/default/reports/index.html:19 +#: templates/web/fixmybarangay/reports/index.html:23 msgid "Recently <br>fixed" msgstr "Nylig løste <br>problemer" @@ -2458,7 +2535,7 @@ msgstr "Nylig løste <br>problemer" msgid "Recently fixed" msgstr "Nylig løste problemer" -#: templates/web/default/index.html:50 templates/web/fixmystreet/index.html:62 +#: templates/web/default/index.html:37 templates/web/fixmystreet/index.html:45 msgid "Recently reported problems" msgstr "Nylig meldte problemer" @@ -2475,11 +2552,17 @@ msgstr "" "tjenesten, husk at du kan kontakte administrasjonen direkte via deres egen " "nettside." +#: templates/web/fixmybarangay/report/new/notes.html:9 +msgid "" +"Remember that, for the pilot project, FixMyBarangay is only for reporting " +"potholes and streetlights in bgy. Luz or Basak San Nicolas." +msgstr "" + #: templates/web/default/admin/report_blocks.html:16 msgid "Remove flag" msgstr "Fjern flagg" -#: templates/web/default/admin/report_edit.html:53 +#: templates/web/default/admin/report_edit.html:54 #: templates/web/default/admin/update_edit.html:48 msgid "Remove photo (can't be undone!)" msgstr "Fjern bilde (kan ikke gjøres om!)" @@ -2493,12 +2576,13 @@ msgstr "Rapporter tomme hjem" #: templates/web/fiksgatami/footer.html:5 #: templates/web/fiksgatami/nn/footer.html:5 #: templates/web/fixmystreet/footer.html:45 -#: templates/web/reading/footer.html:6 +#: templates/web/reading/footer.html:6 templates/web/stevenage/footer.html:39 +#: templates/web/zurich/footer.html:10 msgid "Report a problem" msgstr "Rapporter et problem" #: templates/web/bromley/report/display.html:28 -#: templates/web/fixmystreet/report/display.html:22 +#: templates/web/fixmystreet/report/display.html:29 msgid "Report abuse" msgstr "Rapporter misbruk" @@ -2506,12 +2590,14 @@ msgstr "Rapporter misbruk" msgid "Report empty properties" msgstr "Rapporter tomme hjem" -#: perllib/FixMyStreet/App/Controller/Rss.pm:277 +#: perllib/FixMyStreet/App/Controller/Rss.pm:286 msgid "Report on %s" msgstr "Rapport på %s" #: templates/web/default/index.html:15 -#: templates/web/fixmystreet/around/postcode_form.html:6 +#: templates/web/fixmystreet/around/intro.html:1 +#: templates/web/stevenage/around/intro.html:1 +#: templates/web/zurich/around/intro.html:1 msgid "Report, view, or discuss local problems" msgstr "Rapporter, finn eller diskuter lokale problemer" @@ -2523,7 +2609,7 @@ msgstr "Rapportert %s" msgid "Reported %s, to %s" msgstr "Rapportert %s, til %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:512 +#: perllib/FixMyStreet/DB/Result/Problem.pm:520 #: templates/web/default/contact/index.html:45 #: templates/web/fixmystreet/contact/index.html:46 msgid "Reported anonymously at %s" @@ -2535,33 +2621,33 @@ msgstr "Rapportert anonymt %s" msgid "Reported before" msgstr "Rapportert tidligere" -#: perllib/FixMyStreet/DB/Result/Problem.pm:504 +#: perllib/FixMyStreet/DB/Result/Problem.pm:512 msgid "Reported by %s anonymously at %s" msgstr "Publisert av %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:535 +#: perllib/FixMyStreet/DB/Result/Problem.pm:543 #: templates/web/default/contact/index.html:47 #: templates/web/fixmystreet/contact/index.html:48 msgid "Reported by %s at %s" msgstr "Publisert av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:526 +#: perllib/FixMyStreet/DB/Result/Problem.pm:534 msgid "Reported by %s by %s at %s" msgstr "Rapporter av %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:500 +#: perllib/FixMyStreet/DB/Result/Problem.pm:508 msgid "Reported by %s in the %s category anonymously at %s" msgstr "Rapportert av %s i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:520 +#: perllib/FixMyStreet/DB/Result/Problem.pm:528 msgid "Reported by %s in the %s category by %s at %s" msgstr "Rapportert av %s i kategorien %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:508 +#: perllib/FixMyStreet/DB/Result/Problem.pm:516 msgid "Reported in the %s category anonymously at %s" msgstr "Rapportert i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:530 +#: perllib/FixMyStreet/DB/Result/Problem.pm:538 msgid "Reported in the %s category by %s at %s" msgstr "Rapportert i kategorien %s av %s %s" @@ -2573,10 +2659,16 @@ msgstr "Rapportert i kategorien %s av %s %s" #: templates/web/fixmystreet/report/new/fill_in_details.html:0 #: templates/web/fixmystreet/report/new/fill_in_details.html:5 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 +#: templates/web/zurich/report/new/fill_in_details_form.html:2 msgid "Reporting a problem" msgstr "Legger til et problem" -#: templates/web/default/around/display_location.html:95 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1033 +#, fuzzy +msgid "Reports" +msgstr "Alle rapporter" + +#: templates/web/default/around/tabbed_lists.html:3 msgid "Reports on and around the map" msgstr "Problemer i og rundt kartet" @@ -2584,7 +2676,7 @@ msgstr "Problemer i og rundt kartet" msgid "Resend report" msgstr "Send rapport på nytt" -#: perllib/FixMyStreet/Geocode/OSM.pm:166 +#: perllib/FixMyStreet/Geocode/OSM.pm:173 msgid "" "Road operator for this named road (derived from road reference number and " "type): %s" @@ -2592,34 +2684,23 @@ msgstr "" "Veioperatør for denne navngitte veien (utledet fra veiens referansenummer og " "type) %s" -#: perllib/FixMyStreet/Geocode/OSM.pm:163 +#: perllib/FixMyStreet/Geocode/OSM.pm:170 msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Veioperatør for denne navngitte veien (fra OpenStreetMap): %s" -#: templates/web/default/admin/council_edit.html:35 +#: templates/web/default/admin/council_edit.html:63 msgid "Save changes" msgstr "Lagre endringer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1027 -msgid "Search Abuse" -msgstr "Søk etter misbruk" - -#: templates/web/default/admin/search_abuse.html:1 -msgid "Search Abuse Table" -msgstr "Søk i misbrukstabell" - -#: perllib/FixMyStreet/App/Controller/Admin.pm:1023 #: templates/web/default/admin/list_flagged.html:1 #: templates/web/default/admin/search_reports.html:1 msgid "Search Reports" msgstr "Søk i rapporter" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1026 #: templates/web/default/admin/search_users.html:1 msgid "Search Users" msgstr "Søk i brukere" -#: templates/web/default/admin/search_abuse.html:4 #: templates/web/default/admin/search_reports.html:5 #: templates/web/default/admin/search_users.html:5 msgid "Search:" @@ -2634,7 +2715,7 @@ msgstr "" "Velg hvilken type varsel du ønsker og klikk på knappen for en RSS-kilde, " "eller skriv inn din e-postadresse for å abonnere på et e-postvarsel." -#: perllib/FixMyStreet/DB/Result/Problem.pm:618 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 msgid "Sent to %s %s later" msgstr "Sendt til %s %s senere" @@ -2646,6 +2727,10 @@ msgstr "Sendt:" msgid "Service:" msgstr "Tjeneste:" +#: templates/web/fixmystreet/report/display.html:33 +msgid "Share" +msgstr "" + #: templates/web/emptyhomes/static/about.html:21 msgid "Shelter Cymru" msgstr "Shelter Cymru" @@ -2670,32 +2755,30 @@ msgstr "" #: templates/web/bromley/report/display.html:203 #: templates/web/bromley/report/new/fill_in_details_form.html:129 #: templates/web/bromley/report/new/fill_in_details_form.html:175 -#: templates/web/default/report/display.html:208 #: templates/web/default/report/new/fill_in_details_form.html:210 -#: templates/web/fixmystreet/report/display.html:185 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:126 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:186 +#: templates/web/default/report/update-form.html:155 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:139 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:207 +#: templates/web/fixmystreet/report/update-form.html:142 msgid "Show my name publicly" msgstr "Vis mitt navn offentlig" -#: templates/web/default/around/display_location.html:60 -#: templates/web/fixmystreet/around/display_location.html:60 +#: templates/web/default/around/display_location.html:65 msgid "Show old" msgstr "Vis gamle" -#: templates/web/default/around/display_location.html:51 -#: templates/web/fixmystreet/around/display_location.html:52 +#: templates/web/default/around/display_location.html:56 msgid "Show pins" msgstr "Vis nåler" #: templates/web/default/auth/general.html:3 #: templates/web/default/auth/general.html:49 -#: templates/web/fixmybarangay/header.html.orig:46 +#: templates/web/fixmybarangay/header.html:68 #: templates/web/fixmystreet/auth/general.html:3 -#: templates/web/fixmystreet/auth/general.html:38 -#: templates/web/fixmystreet/auth/general.html:58 -#: templates/web/fixmystreet/header.html:51 -#: templates/web/zurich/header.html:51 +#: templates/web/fixmystreet/auth/general.html:42 +#: templates/web/fixmystreet/auth/general.html:62 +#: templates/web/fixmystreet/header.html:53 +#: templates/web/stevenage/header.html:101 templates/web/zurich/header.html:51 msgid "Sign in" msgstr "Logg inn" @@ -2714,6 +2797,7 @@ msgstr "Logg inn eller opprett en konto" #: templates/web/emptyhomes/header.html:41 #: templates/web/fiksgatami/header.html:22 #: templates/web/fiksgatami/nn/header.html:22 +#: templates/web/fixmybarangay/auth/sign_out.html:1 #: templates/web/lichfielddc/header.html:177 #: templates/web/reading/header.html:33 msgid "Sign out" @@ -2729,11 +2813,13 @@ msgid "Signed in as %s" msgstr "Logget inn som %s" #: templates/web/default/report/new/fill_in_details_text.html:1 +#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1 #: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 msgid "Some categories may require additional information." msgstr "Noen kategorier krever kanskje mer informasjon" #: templates/web/default/alert/index.html:42 +#: templates/web/fixmybarangay/alert/index.html:32 msgid "Some photos of recent reports" msgstr "Noen bilder av nylig meldte problemer" @@ -2746,7 +2832,7 @@ msgstr "Noe tekst å oversette" msgid "Some unconfirmeds" msgstr "Noen ubekreftede" -#: perllib/FixMyStreet/Cobrand/UK.pm:97 +#: perllib/FixMyStreet/Cobrand/UK.pm:89 msgid "" "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2759,15 +2845,16 @@ msgstr "" "Beklager, men det oppsto et problem når vi forsøkte å bekrefte " "problemrapporten din" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:214 -#: perllib/FixMyStreet/Geocode.pm:27 perllib/FixMyStreet/Geocode/Bing.pm:51 -#: perllib/FixMyStreet/Geocode/Google.pm:69 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:211 +#: perllib/FixMyStreet/Geocode.pm:28 perllib/FixMyStreet/Geocode/Bing.pm:58 +#: perllib/FixMyStreet/Geocode/Google.pm:74 +#: perllib/FixMyStreet/Geocode/OSM.pm:66 msgid "Sorry, we could not find that location." msgstr "Beklager, vi kunne ikke finne det stedet." -#: perllib/FixMyStreet/Geocode/Bing.pm:46 -#: perllib/FixMyStreet/Geocode/Google.pm:64 -#: perllib/FixMyStreet/Geocode/OSM.pm:59 +#: perllib/FixMyStreet/Geocode/Bing.pm:53 +#: perllib/FixMyStreet/Geocode/Google.pm:69 +#: perllib/FixMyStreet/Geocode/Zurich.pm:82 msgid "Sorry, we could not parse that location. Please try again." msgstr "Beklager, vi kunne ikke tolke den posisjonen. Vennligst prøv på nytt." @@ -2792,17 +2879,17 @@ msgstr "Startmåned:" #: templates/web/default/admin/list_flagged.html:18 #: templates/web/default/admin/list_updates.html:6 #: templates/web/default/admin/search_reports.html:21 -#: templates/web/fixmystreet/report/display.html:72 +#: templates/web/fixmystreet/report/update-form.html:26 msgid "State" msgstr "Tilstand" #: templates/web/default/admin/report_edit.html:17 #: templates/web/default/admin/update_edit.html:18 -#: templates/web/default/report/display.html:77 +#: templates/web/default/report/update-form.html:28 msgid "State:" msgstr "Tilstand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1029 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1038 #: templates/web/default/admin/stats.html:1 msgid "Stats" msgstr "Statistikk" @@ -2813,7 +2900,7 @@ msgstr "Fortsatt åpen via spørreskjema, %s" #: templates/web/bromley/report/new/fill_in_details_form.html:48 #: templates/web/fixmystreet/contact/index.html:79 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:58 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:60 msgid "Subject" msgstr "Emne" @@ -2830,13 +2917,14 @@ msgstr "Emne:" #: templates/web/default/report/new/fill_in_details_form.html:114 #: templates/web/default/report/new/fill_in_details_form.html:154 #: templates/web/default/report/new/fill_in_details_form.html:176 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:137 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:162 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:201 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:152 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:177 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:222 +#: templates/web/zurich/report/new/fill_in_details_form.html:128 msgid "Submit" msgstr "Send inn" -#: templates/web/default/admin/report_edit.html:56 +#: templates/web/default/admin/report_edit.html:57 #: templates/web/default/admin/update_edit.html:51 #: templates/web/default/admin/user_edit.html:20 msgid "Submit changes" @@ -2851,16 +2939,24 @@ msgstr "Send inn spørreskjema" #: templates/web/default/alert/updates.html:17 #: templates/web/default/report/display.html:38 #: templates/web/fixmystreet/alert/updates.html:23 -#: templates/web/fixmystreet/report/display.html:37 +#: templates/web/fixmystreet/report/display.html:56 msgid "Subscribe" msgstr "Abonner" #: templates/web/default/alert/_list.html:97 +#: templates/web/fixmybarangay/alert/_list.html:42 #: templates/web/fixmystreet/alert/_list.html:92 msgid "Subscribe me to an email alert" msgstr "Jeg ønsker å abonnere på e-postvarsel" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1021 +#: templates/web/fixmybarangay/alert/_list.html:6 +#, fuzzy +msgid "Subscribe to an alert based upon what baranagay you’re in:" +msgstr "" +"Eller du kan abonnere på varsel basert på bydel eller administrasjon du " +"hører inn under:" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1031 #: templates/web/default/admin/index.html:1 msgid "Summary" msgstr "Oppsummering" @@ -2869,10 +2965,15 @@ msgstr "Oppsummering" #: templates/web/emptyhomes/reports/index.html:1 #: templates/web/fiksgatami/nn/reports/index.html:1 #: templates/web/fiksgatami/reports/index.html:1 +#: templates/web/fixmybarangay/reports/index.html:1 msgid "Summary reports" msgstr "Oppsummeringsrapporter" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1025 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1035 +#, fuzzy +msgid "Survey" +msgstr "Resultater fra spørreundersøkelsen" + #: templates/web/default/admin/questionnaire.html:1 msgid "Survey Results" msgstr "Resultater fra spørreundersøkelsen" @@ -2881,7 +2982,7 @@ msgstr "Resultater fra spørreundersøkelsen" msgid "Text" msgstr "Tekst" -#: templates/web/default/admin/council_contacts.html:18 +#: templates/web/default/admin/council_contacts.html:20 msgid "Text only version" msgstr "Tekst-versjon" @@ -2967,12 +3068,12 @@ msgstr "" "Takk, glad for å høre at problemet er fikset! Vi vil gjerne spørre deg om du " "har rapportert et problem til en administrasjon tidligere?" -#: perllib/FixMyStreet/App/Controller/Photo.pm:190 +#: perllib/FixMyStreet/App/Controller/Photo.pm:189 msgid "" "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Bildet ser ikke ut til å blitt lastet opp riktig (%s), prøv på nytt." -#: perllib/FixMyStreet/App/Controller/Council.pm:91 +#: perllib/FixMyStreet/App/Controller/Council.pm:90 msgid "" "That location does not appear to be covered by a council; perhaps it is " "offshore or outside the country. Please try again." @@ -2981,20 +3082,25 @@ msgstr "" "utenfor lander - vennligst forsøk et annet sted." # Should this be "Norge" or "Storbritannia" ? -#: perllib/FixMyStreet/App/Controller/Location.pm:107 +#: perllib/FixMyStreet/App/Controller/Location.pm:121 msgid "That location does not appear to be in the UK; please try again." msgstr "Det stedet virker ikke å være i Storbritannia. Vennligst prøv igjen." #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:90 +#: perllib/FixMyStreet/Cobrand/UK.pm:82 msgid "That postcode was not recognised, sorry." msgstr "Det postnummeret ble ikke gjenkjent, beklager." -#: perllib/FixMyStreet/App/Controller/Admin.pm:605 +#: perllib/FixMyStreet/App/Controller/Admin.pm:616 msgid "That problem will now be resent." msgstr "Det problemet vil nå bli sendt på nytt." -#: perllib/FixMyStreet/App/Controller/Report.pm:75 +#: perllib/FixMyStreet/App/Controller/Report.pm:98 +#, fuzzy +msgid "That report cannot be viewed on FixMyStreet." +msgstr "Den rapporten har blitt fjernet fra FiksGataMi." + +#: perllib/FixMyStreet/App/Controller/Report.pm:92 msgid "That report has been removed from FixMyStreet." msgstr "Den rapporten har blitt fjernet fra FiksGataMi." @@ -3040,12 +3146,10 @@ msgstr "" #: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 #: templates/web/fixmystreet/report/new/fill_in_details_text.html:3 msgid "" -"The council won’t be able to help unless you leave as much\n" -"detail as you can. Please describe the exact location of the problem (e.g. " -"on a\n" -"wall), what it is, how long it has been there, a description (and a photo " -"of\n" -"the problem if you have one), etc." +"The council won’t be able to help unless you leave as much detail as " +"you can. Please describe the exact location of the problem (e.g. on a wall), " +"what it is, how long it has been there, a description (and a photo of the " +"problem if you have one), etc." msgstr "" "Administrasjonen vil ikke være i stand til å hjelpe med mindre du legger inn " "så mange\n" @@ -3067,8 +3171,8 @@ msgstr "" "Detaljene om ditt problem er tilgjengelig på høyre kant av denne siden." #: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:44 -#: perllib/FixMyStreet/App/Controller/Reports.pm:75 +#: perllib/FixMyStreet/App/Controller/Reports.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:74 msgid "The error was: %s" msgstr "Feilen var: %s" @@ -3082,7 +3186,7 @@ msgstr "" "service_request_id, description, lat, long, media_url, status, " "requested_datetime, updated_datetime, service_code and service_name." -#: perllib/FixMyStreet/Geocode/OSM.pm:158 +#: perllib/FixMyStreet/Geocode/OSM.pm:165 msgid "" "The following information about the nearest road might be inaccurate or " "irrelevant, if the problem is close to several roads or close to a road " @@ -3164,6 +3268,7 @@ msgstr "Den enkleste meldingen er vår geografiske:" #: templates/web/default/report/new/councils_text_some.html:11 #: templates/web/default/report/new/fill_in_details_form.html:17 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 +#: templates/web/zurich/report/new/fill_in_details_form.html:12 msgid "" "The subject and details of the problem will be public, plus your name if you " "give us permission." @@ -3171,7 +3276,7 @@ msgstr "" "Tittelen og detaljene for problemet vil bli offentlig, pluss navnet ditt\n" "hvis du gir oss tillatelse til det." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:269 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:271 msgid "" "The user could not locate the problem on a map, but to see the area around " "the location they entered" @@ -3179,7 +3284,7 @@ msgstr "" "Brukeren kunne ikke plassere problemet på et kart, men sjekk området rundt " "stedet de skrev inn" -#: perllib/FixMyStreet/App/Controller/Reports.pm:72 +#: perllib/FixMyStreet/App/Controller/Reports.pm:71 msgid "" "There was a problem showing the All Reports page. Please try again later." msgstr "" @@ -3190,8 +3295,8 @@ msgstr "" msgid "There was a problem showing this page. Please try again later." msgstr "Det var problemer med å vise denne siden. Vennligst prøv igjen senere." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:733 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:130 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:736 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 #: templates/web/default/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:24 msgid "" @@ -3210,7 +3315,7 @@ msgstr "" "Det var problemer med din epost/passord-kombinasjon. Vær så snill å forsøk " "igjen." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:256 msgid "There was a problem with your update. Please try again." msgstr "Det var problemer med din oppdatering. Vær så snill å forsøk igjen." @@ -3218,7 +3323,7 @@ msgstr "Det var problemer med din oppdatering. Vær så snill å forsøk igjen. msgid "There were problems with your report. Please see below." msgstr "Det var problemer med din rapport. Vennligst se under." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:279 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:283 msgid "There were problems with your update. Please see below." msgstr "Det var problemer med din oppdatering. Vennligst se under." @@ -3230,7 +3335,7 @@ msgstr "" "Denne API-implementasjonen er under arbeid og ennå ikke stabil. Den vil " "endre seg uten advarsel i fremtiden." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:339 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:341 msgid "" "This email has been sent to both councils covering the location of the " "problem, as the user did not categorise it; please ignore it if you're not " @@ -3243,7 +3348,7 @@ msgstr "" "eller gi oss beskjed om hvilken kategori av problemer dette er så vi kan " "legge det til i vårt system." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:342 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:344 msgid "" "This email has been sent to several councils covering the location of the " "problem, as the category selected is provided for all of them; please ignore " @@ -3254,8 +3359,8 @@ msgstr "" "snill å ignorere e-posten hvis dere ikke er korrekt administrasjon for å " "håndtere denne saken." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:865 -#: perllib/FixMyStreet/Cobrand/UK.pm:62 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:868 +#: perllib/FixMyStreet/Cobrand/UK.pm:54 msgid "This information is required" msgstr "Denne informasjonen er påkrevd" @@ -3267,14 +3372,23 @@ msgstr "" "Dette er et utviklernettsted. Ting kan knekke når som helst og databasen vil " "bli periodisk slettet." -#: templates/web/emptyhomes/reports/council.html:58 +#: templates/web/emptyhomes/reports/body.html:58 msgid "This is a summary of all reports for one %s." msgstr "Dette er en oppsummering av alle rapporter for en %s." -#: templates/web/emptyhomes/reports/council.html:60 +#: templates/web/emptyhomes/reports/body.html:60 msgid "This is a summary of all reports for this %s." msgstr "Dette er en oppsummering for alle rapporter for denne %s." +#: templates/web/fixmybarangay/reports/index.html:7 +#, fuzzy +msgid "" +"This is a summary of all reports on this site; select a particular barangay " +"to see the reports sent there." +msgstr "" +"Dette er en opplisting av alle problemene i denne tjenesten; velg en bestemt " +"administrasjon for å se problemer som er sendt dit." + #: templates/web/default/reports/index.html:7 #: templates/web/emptyhomes/reports/index.html:4 #: templates/web/fiksgatami/nn/reports/index.html:4 @@ -3292,15 +3406,15 @@ msgstr "Dette problemet er lukket" #: templates/web/bromley/report/display.html:96 #: templates/web/default/report/banner.html:12 -#: templates/web/default/report/display.html:95 +#: templates/web/default/report/update-form.html:46 #: templates/web/emptyhomes/report/display.html:12 -#: templates/web/fixmystreet/report/display.html:90 +#: templates/web/fixmystreet/report/update-form.html:44 msgid "This problem has been fixed" msgstr "Dette problemet er løst" #: templates/web/bromley/report/display.html:90 -#: templates/web/default/report/display.html:90 -#: templates/web/fixmystreet/report/display.html:84 +#: templates/web/default/report/update-form.html:41 +#: templates/web/fixmystreet/report/update-form.html:38 msgid "This problem has not been fixed" msgstr "Dette problemet har ikke blitt løst" @@ -3312,25 +3426,25 @@ msgstr "Dette problemet er under arbeid" msgid "This problem is old and of unknown status." msgstr "Dette problemet er gammel og med ukjent status." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:83 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 msgid "This report is currently marked as closed." msgstr "Denne rapporten er for tiden markert som lukket." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:81 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84 msgid "This report is currently marked as fixed." msgstr "Denne rapporten er for tiden markert som fikset." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:85 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88 msgid "This report is currently marked as open." msgstr "Denne rapporten er for tiden markert som åpen." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:262 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:264 msgid "" "This web page also contains a photo of the problem, provided by the user." msgstr "" "Denne nettsiden inneholder også et bilde av problemet, sendt inn av brukeren." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1024 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1034 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -3340,7 +3454,7 @@ msgstr "Tidslinje" msgid "Title" msgstr "Tittel" -#: templates/web/default/around/display_location.html:69 +#: templates/web/default/around/_report_banner.html:2 msgid "" "To <strong>report a problem</strong>, click on the map at the correct " "location." @@ -3361,7 +3475,7 @@ msgid "" msgstr "" "Du finner lokale problemer ved å søke på ditt postnummer, veinavn eller sted" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:268 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:270 msgid "To view a map of the precise location of this issue" msgstr "For å se en kart med en mer presis plassering for dette problemet." @@ -3372,7 +3486,7 @@ msgstr "For å se en kart med en mer presis plassering for dette problemet." msgid "Total" msgstr "Totalt" -#: perllib/FixMyStreet/App/Controller/Reports.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:42 msgid "Unable to look up areas in MaPit. Please try again later." msgstr "Klarte ikke slå opp områder i MaPit. Vennligst forsøk igjen senere." @@ -3386,16 +3500,16 @@ msgstr "Ubekreftet" msgid "Unknown" msgstr "Ukjent" -#: perllib/FixMyStreet/App/Controller/Rss.pm:164 +#: perllib/FixMyStreet/App/Controller/Rss.pm:173 msgid "Unknown alert type" msgstr "Ukjent varsel-type" -#: perllib/FixMyStreet/App/Controller/Report.pm:70 +#: perllib/FixMyStreet/App/Controller/Report.pm:87 msgid "Unknown problem ID" msgstr "Ukjent problem-Id" #: templates/web/bromley/report/display.html:66 -#: templates/web/fixmystreet/report/display.html:65 +#: templates/web/fixmystreet/report/update-form.html:19 msgid "Update" msgstr "Oppdatering" @@ -3433,17 +3547,17 @@ msgstr "En oppdatering markerte dette problemet som fikset." msgid "Update reopened problem" msgstr "En oppdatering gjennåpnet problemet" -#: templates/web/default/admin/council_contacts.html:62 +#: templates/web/default/admin/council_contacts.html:68 msgid "Update statuses" msgstr "Oppdater tilstanden" -#: templates/web/default/report/display.html:71 +#: templates/web/default/report/update-form.html:22 msgid "Update:" msgstr "Oppdatering:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:694 -#: perllib/FixMyStreet/App/Controller/Admin.pm:809 -#: perllib/FixMyStreet/App/Controller/Admin.pm:889 +#: perllib/FixMyStreet/App/Controller/Admin.pm:708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:839 +#: perllib/FixMyStreet/App/Controller/Admin.pm:899 msgid "Updated!" msgstr "Oppdatert!" @@ -3466,20 +3580,21 @@ msgstr "Oppdateringer av {{title}}" msgid "Updates to this problem, FixMyStreet" msgstr "Oppdateringer til dette problemet, FiksGataMi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1182 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1191 msgid "User flag removed" msgstr "Brukerflagg fjernet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1154 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1163 msgid "User flagged" msgstr "Bruker flagget" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 #: templates/web/default/admin/list_flagged.html:30 msgid "Users" msgstr "Brukere" -#: perllib/FixMyStreet/App/Controller/Admin.pm:309 -#: perllib/FixMyStreet/App/Controller/Admin.pm:339 +#: perllib/FixMyStreet/App/Controller/Admin.pm:315 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 msgid "Values updated" msgstr "Verdier oppdatert" @@ -3488,7 +3603,7 @@ msgstr "Verdier oppdatert" msgid "View report on site" msgstr "Se rapport på nettstedet" -#: templates/web/default/reports/council.html:18 +#: templates/web/default/reports/body.html:18 msgid "View reports by ward" msgstr "Se rapport per bydel" @@ -3500,20 +3615,19 @@ msgstr "Vis din rapport" #: templates/web/default/around/display_location.html:33 #: templates/web/emptyhomes/around/display_location.html:0 #: templates/web/emptyhomes/around/display_location.html:16 -#: templates/web/fixmystreet/around/display_location.html:0 -#: templates/web/fixmystreet/around/display_location.html:33 msgid "Viewing a location" msgstr "Ser på et sted" #: templates/web/bromley/report/display.html:0 #: templates/web/default/report/display.html:0 +#: templates/web/emptyhomes/report/display.html:1 #: templates/web/emptyhomes/report/display.html:2 #: templates/web/fixmystreet/report/display.html:0 msgid "Viewing a problem" msgstr "Ser på et problem" -#: templates/web/default/reports/council.html:20 -#: templates/web/emptyhomes/reports/council.html:18 +#: templates/web/default/reports/body.html:20 +#: templates/web/emptyhomes/reports/body.html:18 msgid "Wards of this council" msgstr "Bydeler innenfor denne administrasjonen" @@ -3542,18 +3656,19 @@ msgstr "" "endret seg med eiedommen du rapporterte." #: templates/web/bromley/report/display.html:141 -#: templates/web/fixmystreet/report/display.html:153 +#: templates/web/fixmystreet/report/update-form.html:113 msgid "We never show your email" msgstr "Vi viser aldri din e-postadresse" #: templates/web/bromley/report/new/fill_in_details_form.html:133 #: templates/web/bromley/report/new/fill_in_details_form.html:179 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:130 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:190 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:144 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:211 +#: templates/web/zurich/report/new/fill_in_details_form.html:114 msgid "We never show your email address or phone number." msgstr "Vi viser aldri din e-postadresse eller ditt telefonnummer" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:349 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:351 msgid "" "We realise this problem might be the responsibility of %s; however, we don't " "currently have any contact details for them. If you know of an appropriate " @@ -3563,13 +3678,14 @@ msgstr "" "tiden kontaktinformasjon for dem. Hvis du vet om en egnet kontaktadresse, ta " "kontakt med oss." -#: templates/web/default/index.html:34 templates/web/emptyhomes/index.html:59 -#: templates/web/fixmystreet/index.html:45 +#: templates/web/default/index-steps.html:16 +#: templates/web/emptyhomes/index.html:59 msgid "We send it to the council on your behalf" msgstr "Vi sender til administrasjon på dine vegne" #: templates/web/bromley/report/new/fill_in_details_form.html:217 #: templates/web/default/report/new/notes.html:5 +#: templates/web/fixmybarangay/report/new/notes.html:5 msgid "" "We will only use your personal information in accordance with our <a href=\"/" "faq#privacy\">privacy policy.</a>" @@ -3604,8 +3720,8 @@ msgstr "" "Vi ønsker å få din tilbakemelding om hva du mener om denne tjenesten. Bare " "fyll ut skjemaet, eller send en e-post <a href='mailto:%s'>%s</a>:" -#: templates/web/default/admin/council_contacts.html:41 -#: templates/web/default/admin/council_edit.html:41 +#: templates/web/default/admin/council_contacts.html:45 +#: templates/web/default/admin/council_edit.html:69 msgid "When edited" msgstr "Når redigert" @@ -3614,7 +3730,7 @@ msgstr "Når redigert" msgid "When sent" msgstr "Når sendt" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:612 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:611 msgid "Whole block of empty flats" msgstr "Hel blokk med tomme leiligheter" @@ -3630,6 +3746,7 @@ msgstr "" "href=\"%s\">MaPit</a>." #: templates/web/fixmystreet/footer.html:22 +#: templates/web/stevenage/footer.html:22 msgid "" "Would you like better integration with FixMyStreet? <a href=\"http://www." "mysociety.org/for-councils/fixmystreet/\">Find out about FixMyStreet for " @@ -3639,6 +3756,7 @@ msgstr "" "Finn ut mer om FiksGataMi for administrajoner</a>." #: templates/web/fixmystreet/footer.html:18 +#: templates/web/stevenage/footer.html:18 msgid "" "Would you like to contribute to FixMyStreet? Our code is open source and <a " "href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>." @@ -3656,6 +3774,7 @@ msgstr "" "sjekke status?" #: templates/web/default/report/new/notes.html:8 +#: templates/web/fixmybarangay/report/new/notes.html:8 #: templates/web/fixmystreet/report/new/notes.html:7 msgid "" "Writing your message entirely in block capitals makes it hard to read, as " @@ -3668,8 +3787,9 @@ msgstr "" msgid "Year" msgstr "År" -#: templates/web/default/admin/council_contacts.html:48 -#: templates/web/default/admin/council_contacts.html:49 +#: templates/web/default/admin/council_contacts.html:52 +#: templates/web/default/admin/council_contacts.html:53 +#: templates/web/default/admin/council_contacts.html:54 #: templates/web/default/admin/council_edit.html:5 #: templates/web/default/admin/list_updates.html:30 #: templates/web/default/admin/list_updates.html:31 @@ -3689,8 +3809,8 @@ msgstr "Ja" #: templates/web/bromley/report/display.html:155 #: templates/web/bromley/report/new/fill_in_details_form.html:198 -#: templates/web/fixmystreet/report/display.html:133 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:156 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:171 +#: templates/web/fixmystreet/report/update-form.html:87 msgid "Yes I have a password" msgstr "<strong>Ja</strong>, jeg har et passord" @@ -3712,7 +3832,7 @@ msgstr "" "Du rapporterer at følgende oppdatering er støtende, inneholder personlig " "informasjon, eller lignende:" -#: templates/web/emptyhomes/reports/council.html:64 +#: templates/web/emptyhomes/reports/body.html:64 msgid "" "You can <a href=\"%s\">view all reports for the council</a> or <a href=\"/" "reports\">show all councils</a>." @@ -3720,7 +3840,7 @@ msgstr "" "Du kan <a href=\"%s\">se alle rapporter for administrasjonen</a> eller <a " "href=\"/reports\">se alle administrasjonene</a>." -#: templates/web/emptyhomes/reports/council.html:66 +#: templates/web/emptyhomes/reports/body.html:66 msgid "You can <a href=\"/reports\">show all councils</a>." msgstr "Du kan <a href=\"/reports/\">se alle administrasjoner</a>." @@ -3748,7 +3868,8 @@ msgstr "" #: templates/web/default/questionnaire/index.html:92 #: templates/web/default/report/new/fill_in_details_form.html:93 #: templates/web/fixmystreet/questionnaire/index.html:87 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:101 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:99 +#: templates/web/zurich/report/new/fill_in_details_form.html:93 msgid "" "You have already attached a photo to this report, attaching another one will " "replace it." @@ -3757,8 +3878,8 @@ msgstr "" "vil bytte ut dette." #: templates/web/bromley/report/display.html:106 -#: templates/web/default/report/display.html:106 -#: templates/web/fixmystreet/report/display.html:100 +#: templates/web/default/report/update-form.html:57 +#: templates/web/fixmystreet/report/update-form.html:54 msgid "" "You have already attached a photo to this update, attaching another one will " "replace it." @@ -3767,12 +3888,14 @@ msgstr "" "annet vil bytte ut dette." #: templates/web/default/auth/sign_out.html:3 +#: templates/web/fixmybarangay/auth/sign_out.html:3 msgid "You have been signed out" msgstr "Du er allerede logget ut" #: templates/web/bromley/report/new/fill_in_details_form.html:25 #: templates/web/default/report/new/fill_in_details_form.html:7 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:27 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:28 +#: templates/web/zurich/report/new/fill_in_details_form.html:28 msgid "" "You have located the problem at the point marked with a green pin on the " "map. If this is not the correct location, simply click on the map again. " @@ -3807,8 +3930,8 @@ msgstr "Du har lykkes med å opprette ditt varsel." msgid "You have successfully deleted your alert." msgstr "Sletting av ditt varsel var vellykket." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:740 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:136 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:743 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:140 msgid "" "You have successfully signed in; please check and confirm your details are " "accurate:" @@ -3842,15 +3965,17 @@ msgstr "Dine rapporter" #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 #: templates/web/fixmystreet/contact/index.html:72 -#: templates/web/fixmystreet/report/display.html:34 -#: templates/web/fixmystreet/report/display.html:36 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:142 +#: templates/web/fixmystreet/report/display.html:53 +#: templates/web/fixmystreet/report/display.html:55 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:115 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:157 +#: templates/web/zurich/report/new/fill_in_details_form.html:106 msgid "Your email" msgstr "Din e-post" #: templates/web/bromley/report/display.html:130 #: templates/web/fixmystreet/auth/general.html:26 -#: templates/web/fixmystreet/report/display.html:124 +#: templates/web/fixmystreet/report/update-form.html:78 msgid "Your email address" msgstr "Din e-postadresse" @@ -3859,8 +3984,9 @@ msgid "Your email address:" msgstr "Din e-postadresse:" #: templates/web/default/alert/_list.html:92 -#: templates/web/default/report/display.html:128 #: templates/web/default/report/new/fill_in_details_form.html:124 +#: templates/web/default/report/update-form.html:79 +#: templates/web/fixmybarangay/alert/_list.html:37 msgid "Your email:" msgstr "Din e-post" @@ -3884,26 +4010,27 @@ msgstr "" msgid "Your last name" msgstr "Ditt etternavn" -#: templates/web/fixmystreet/auth/general.html:53 +#: templates/web/fixmystreet/auth/general.html:57 #: templates/web/fixmystreet/contact/index.html:65 -#: templates/web/fixmystreet/report/display.html:181 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:121 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:181 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:124 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:202 +#: templates/web/fixmystreet/report/update-form.html:138 +#: templates/web/zurich/report/new/fill_in_details_form.html:122 msgid "Your name" msgstr "Ditt navn" #: templates/web/default/auth/general.html:59 #: templates/web/default/contact/index.html:68 -#: templates/web/default/report/display.html:202 #: templates/web/default/report/new/fill_in_details_form.html:203 +#: templates/web/default/report/update-form.html:149 msgid "Your name:" msgstr "Ditt navn:" #: templates/web/bromley/report/display.html:160 #: templates/web/bromley/report/new/fill_in_details_form.html:203 -#: templates/web/fixmystreet/auth/general.html:37 -#: templates/web/fixmystreet/report/display.html:138 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:161 +#: templates/web/fixmystreet/auth/general.html:41 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:176 +#: templates/web/fixmystreet/report/update-form.html:92 msgid "Your password" msgstr "Ditt passord" @@ -3913,8 +4040,9 @@ msgstr "Ditt passord har blitt endret" #: templates/web/bromley/report/new/fill_in_details_form.html:137 #: templates/web/bromley/report/new/fill_in_details_form.html:184 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:134 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:195 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:149 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:216 +#: templates/web/zurich/report/new/fill_in_details_form.html:125 msgid "Your phone number" msgstr "Ditt telefonnummer" @@ -3927,11 +4055,11 @@ msgstr "Dine rapporter" #: templates/web/fiksgatami/footer.html:6 #: templates/web/fiksgatami/nn/footer.html:6 #: templates/web/fixmystreet/footer.html:47 -#: templates/web/reading/footer.html:7 +#: templates/web/reading/footer.html:7 templates/web/stevenage/footer.html:41 msgid "Your reports" msgstr "Dine oppdateringer" -#: templates/web/default/my/my.html:45 templates/web/fixmystreet/my/my.html:45 +#: templates/web/default/my/my.html:45 templates/web/fixmystreet/my/my.html:49 msgid "Your updates" msgstr "Dine oppdateringer" @@ -3943,19 +4071,24 @@ msgstr "Din e-post:" msgid "by %s" msgstr "av %s" -#: templates/web/default/reports/council.html:12 -#: templates/web/default/reports/council.html:13 -#: templates/web/emptyhomes/reports/council.html:6 -#: templates/web/emptyhomes/reports/council.html:7 +#: templates/web/default/reports/body.html:12 +#: templates/web/default/reports/body.html:13 +#: templates/web/emptyhomes/reports/body.html:6 +#: templates/web/emptyhomes/reports/body.html:7 msgid "council" msgstr "administrasjon" +#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#, fuzzy +msgid "council ref: %s" +msgstr "%s ref: %s" + #: templates/web/default/admin/report_edit.html:15 msgid "didn't use map" msgstr "brukte ikke kart" #: templates/web/default/alert/index.html:33 -#: templates/web/fixmystreet/around/postcode_form.html:17 +#: templates/web/fixmystreet/around/postcode_form.html:20 msgid "e.g. ‘%s’ or ‘%s’" msgstr "for eksempel «%s» eller «%s»" @@ -3963,7 +4096,7 @@ msgstr "for eksempel «%s» eller «%s»" msgid "from %d different users" msgstr "fra %d forskjellige brukere" -#: perllib/Utils.pm:289 +#: perllib/Utils.pm:267 msgid "less than a minute" msgstr "mindre enn et minutt" @@ -3975,17 +4108,22 @@ msgstr "markert som %s" msgid "marked as fixed" msgstr "markert som fikset" -#: perllib/FixMyStreet/App/Controller/Admin.pm:112 +#: perllib/FixMyStreet/App/Controller/Admin.pm:113 #: templates/web/default/admin/questionnaire.html:15 #: templates/web/default/admin/questionnaire.html:16 msgid "n/a" msgstr "n/a" #: templates/web/default/alert/_list.html:87 +#: templates/web/fixmybarangay/alert/_list.html:32 #: templates/web/fixmystreet/alert/_list.html:85 msgid "or" msgstr "eller" +#: templates/web/default/js/validation_strings.html:21 +msgid "or locate me automatically" +msgstr "" + #: templates/web/default/admin/report_edit.html:15 msgid "originally entered" msgstr "søkte etter" @@ -4000,9 +4138,9 @@ msgstr "åpnet på nytt" #: templates/web/barnet/header.html:71 templates/web/bromley/header.html:100 #: templates/web/bromley/header.html:65 -#: templates/web/fixmybarangay/header.html.orig:43 -#: templates/web/fixmystreet/header.html:48 -#: templates/web/zurich/header.html:48 +#: templates/web/fixmybarangay/header.html:65 +#: templates/web/fixmystreet/header.html:50 +#: templates/web/stevenage/header.html:98 templates/web/zurich/header.html:48 msgid "sign out" msgstr "logg ut" @@ -4012,22 +4150,20 @@ msgstr "logg ut" #: templates/web/default/report/new/fill_in_details_form.html:14 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:6 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:9 +#: templates/web/zurich/report/new/fill_in_details_form.html:6 +#: templates/web/zurich/report/new/fill_in_details_form.html:9 msgid "the local council" msgstr "den lokale administrasjonen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:541 -msgid "the map was not used so pin location may be inaccurate" -msgstr "kartet ble ikke brukt, så nåleposisjon kan være unøyaktig" - -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 -msgid "their ref: %s" -msgstr "deres ref: %s" +#: templates/web/default/report/_main.html:6 +msgid "there is no pin shown as the user did not use the map" +msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:330 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:332 msgid "this type of local problem" msgstr "denne type lokalt problem" -#: perllib/Utils.pm:263 +#: perllib/Utils.pm:241 msgid "today" msgstr "idag" @@ -4043,10 +4179,10 @@ msgstr "bruker er fra samme administrasjon som problemet - %d" msgid "user is problem owner" msgstr "bruker er eier av problemet" -#: templates/web/default/reports/council.html:0 -#: templates/web/default/reports/council.html:9 -#: templates/web/emptyhomes/reports/council.html:0 -#: templates/web/emptyhomes/reports/council.html:3 +#: templates/web/default/reports/body.html:0 +#: templates/web/default/reports/body.html:9 +#: templates/web/emptyhomes/reports/body.html:0 +#: templates/web/emptyhomes/reports/body.html:3 msgid "ward" msgstr "bydel" @@ -4080,6 +4216,34 @@ msgstr "vil ditt problem ikke bli publisert" msgid "your update will not be posted" msgstr "din oppdatering vil ikke bli publisert" +#: templates/web/emptyhomes/front/stats.html:17 +#, perl-format +msgid "<big>%s</big> report recently" +msgid_plural "<big>%s</big> reports recently" +msgstr[0] "<big>%s</big> rapportert<br>nylig" +msgstr[1] "<big>%s</big> rapportert<br>nylig" + +#: perllib/Utils.pm:286 +#, fuzzy, perl-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d time" +msgstr[1] "%d time" + +#: perllib/Utils.pm:288 +#, fuzzy, perl-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d minutt" +msgstr[1] "%d minutt" + +#: templates/web/default/front/stats.html:29 +#, perl-format +msgid "<big>%s</big> update on reports" +msgid_plural "<big>%s</big> updates on reports" +msgstr[0] "<big>%s</big> rapport-<br>oppdatering" +msgstr[1] "<big>%s</big> rapport-<br>oppdateringer" + #: templates/web/emptyhomes/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." @@ -4090,12 +4254,12 @@ msgstr[0] "" msgstr[1] "" "Vi har ennå ikke detaljer for administrasjonene som dekker dette stedet." -#: templates/web/emptyhomes/front/stats.html:17 -#, perl-format -msgid "<big>%s</big> report recently" -msgid_plural "<big>%s</big> reports recently" -msgstr[0] "<big>%s</big> rapportert<br>nylig" -msgstr[1] "<big>%s</big> rapportert<br>nylig" +#: perllib/Utils.pm:282 +#, fuzzy, perl-format +msgid "%d week" +msgid_plural "%d weeks" +msgstr[0] "%d uke" +msgstr[1] "%d uke" #: templates/web/emptyhomes/front/stats.html:12 #, perl-format @@ -4126,12 +4290,52 @@ msgstr[1] "" "Vi har ennå <strong>ikke</strong> detaljene for de andre administrasjonene " "som dekker dette stedet." -#: templates/web/default/front/stats.html:29 -#, perl-format -msgid "<big>%s</big> update on reports" -msgid_plural "<big>%s</big> updates on reports" -msgstr[0] "<big>%s</big> rapport-<br>oppdatering" -msgstr[1] "<big>%s</big> rapport-<br>oppdateringer" +#: perllib/Utils.pm:284 +#, fuzzy, perl-format +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "%d dag" +msgstr[1] "%d dag" + +#~ msgid "FixMyStreet administration" +#~ msgstr "Fiksgatami-administrasjon" + +#~ msgid "List Flagged" +#~ msgstr "List flagget" + +#~ msgid "Search Abuse" +#~ msgstr "Søk etter misbruk" + +#~ msgid "Search Abuse Table" +#~ msgstr "Søk i misbrukstabell" + +#~ msgid "" +#~ "Please do not be abusive — abusing your council devalues the " +#~ "service for all users." +#~ msgstr "" +#~ "Ikke vær ufin — å kjefte på din administrasjon skader verdien av " +#~ "tjenesten for alle brukerne." + +#~ msgid "%d days" +#~ msgstr "%d dager" + +#~ msgid "%d hours" +#~ msgstr "%d timer" + +#~ msgid "%d minutes" +#~ msgstr "%d minutter" + +#~ msgid "%d weeks" +#~ msgstr "%d uker" + +#~ msgid "All" +#~ msgstr "Alle" + +#~ msgid "the map was not used so pin location may be inaccurate" +#~ msgstr "kartet ble ikke brukt, så nåleposisjon kan være unøyaktig" + +#~ msgid "their ref: %s" +#~ msgstr "deres ref: %s" #~ msgid "FixMyStreet for Councils" #~ msgstr "FiksGataMi for det offentlige" diff --git a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index 22a04be64..e8b2ee555 100644 --- a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2012-08-21 09:54+0100\n" +"POT-Creation-Date: 2012-12-10 13:18+0000\n" "PO-Revision-Date: 2011-12-08 10:56+0100\n" "Last-Translator: Anders Einar Hilden <hildenae@gmail.com>\n" "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n" @@ -21,8 +21,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:555 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:337 +#: perllib/FixMyStreet/DB/Result/Problem.pm:560 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:339 msgid " and " msgstr " og " @@ -55,86 +55,55 @@ msgstr "%d stadfesta varsel, %d ikkje stadfesta" msgid "%d council contacts – %d confirmed, %d unconfirmed" msgstr "%d administrasjonskontaktar – %d stadfesta, %d ikkje stadfesta" -#: perllib/Utils.pm:293 -msgid "%d day" -msgstr "%d dag" - -#: perllib/Utils.pm:293 -msgid "%d days" -msgstr "%d dagar" - #: templates/web/default/admin/council_list.html:27 msgid "%d edits by %s" msgstr "%d redigeringar av %s" -#: perllib/Utils.pm:294 -msgid "%d hour" -msgstr "%d time" - -#: perllib/Utils.pm:294 -msgid "%d hours" -msgstr "%d timar" - #: templates/web/default/admin/index.html:16 msgid "%d live updates" msgstr "%d aktive oppdateringar" -#: perllib/Utils.pm:295 -msgid "%d minute" -msgstr "%d minutt" - -#: perllib/Utils.pm:295 -msgid "%d minutes" -msgstr "%d minutt" - #: templates/web/default/admin/index.html:18 msgid "%d questionnaires sent – %d answered (%s%%)" msgstr "%d spørjeskjema sendt – %d svart (%s%%)" -#: perllib/Utils.pm:292 -msgid "%d week" -msgstr "%d veke" - -#: perllib/Utils.pm:292 -msgid "%d weeks" -msgstr "%d veker" +#: templates/web/default/report/_support.html:3 +msgid "%d supporters" +msgstr "" -#: templates/web/default/reports/council.html:0 -#: templates/web/default/reports/council.html:26 -#: templates/web/emptyhomes/reports/council.html:11 -#: templates/web/emptyhomes/reports/council.html:13 +#: templates/web/default/reports/body.html:0 +#: templates/web/default/reports/body.html:26 +#: templates/web/emptyhomes/reports/body.html:11 +#: templates/web/emptyhomes/reports/body.html:13 msgid "%s - Summary reports" msgstr "%s – oppsummeringsrapportar" -#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "%s ref: %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:288 perllib/FixMyStreet/Cobrand/UK.pm:300 +#: perllib/FixMyStreet/Cobrand/UK.pm:279 perllib/FixMyStreet/Cobrand/UK.pm:291 msgid "%s ward, %s" msgstr "%s bydel, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:488 +#: perllib/FixMyStreet/DB/Result/Problem.pm:496 msgid "%s, reported anonymously at %s" msgstr "%s, rapportert anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:490 +#: perllib/FixMyStreet/DB/Result/Problem.pm:498 msgid "%s, reported by %s at %s" msgstr "%s, rapportert av %s %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:315 perllib/FixMyStreet/Cobrand/UK.pm:327 +#: perllib/FixMyStreet/Cobrand/UK.pm:306 perllib/FixMyStreet/Cobrand/UK.pm:318 msgid "%s, within %s ward" msgstr "%s, innanfor bydelen %s" -#: templates/web/default/admin/stats.html:5 -msgid "%sreports between %s and %s" -msgstr "%srapportar mellom %s og %s" - #: templates/web/default/email_sent.html:28 msgid "(Don't worry — %s)" msgstr "(Ingen grunn til å uroa seg — %s)" #: templates/web/default/admin/report_blocks.html:11 +#: templates/web/default/admin/search_users.html:23 msgid "(Email in abuse table)" msgstr "(Epost i misbruktabellen)" @@ -162,7 +131,7 @@ msgid "(fixed)" msgstr "(løyst)" #: templates/web/default/index.html:12 templates/web/default/index.html:8 -#: templates/web/fixmystreet/around/postcode_form.html:7 +#: templates/web/fixmystreet/around/intro.html:2 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(som tagging, søppel, hol i vegen, eller øydelagte gatelys)" @@ -172,6 +141,7 @@ msgid "(not sent to council)" msgstr "(ikkje rapportert til administrasjonen)" #: templates/web/default/report/new/fill_in_details_form.html:217 +#: templates/web/zurich/report/new/fill_in_details_form.html:118 msgid "(optional)" msgstr "(valfritt)" @@ -184,22 +154,22 @@ msgstr "(sendt til begge)" msgid "(we never show your email address or phone number)" msgstr "(vi viser aldri e-postadressa di eller telefonnummeret ditt)" -#: templates/web/default/report/display.html:209 +#: templates/web/default/report/update-form.html:156 msgid "(we never show your email)" msgstr "(vi viser aldri e-postadressa di)" -#: perllib/FixMyStreet/App/Controller/Admin.pm:284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:285 msgid "*unknown*" msgstr "*ukjent*" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:629 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:655 -#: perllib/FixMyStreet/DB/Result/Problem.pm:345 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:628 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:656 +#: perllib/FixMyStreet/DB/Result/Problem.pm:353 msgid "-- Pick a category --" msgstr "-- Vel ein kategori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:609 -#: perllib/FixMyStreet/DB/Result/Problem.pm:351 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:359 msgid "-- Pick a property type --" msgstr "-- Vel ein eigedomstype --" @@ -209,6 +179,10 @@ msgstr "-- Vel ein eigedomstype --" msgid ". You can <a href=\"%s%s\">view the problem on this site</a>." msgstr ". Du kan <a href=\"%s\">lesa om problemet på portalen</a>." +#: templates/web/default/report/_support.html:3 +msgid "1 supporter" +msgstr "" + #: templates/web/default/questionnaire/completed.html:20 msgid "" "<p style=\"font-size:150%\">Thank you very much for filling in our " @@ -235,7 +209,7 @@ msgstr "" "av folk i nabolaget som jobbar saman, kva med å <a href=\"http://www." "pledgebank.com/new\">publisera ei utfordring om å bidra</a>?</p>" -#: templates/web/fixmystreet/questionnaire/completed-open.html:1 +#: templates/web/fixmystreet/questionnaire/completed-open.html:6 #, fuzzy msgid "" "<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" @@ -254,7 +228,7 @@ msgstr "" "av folk i nabolaget som jobbar saman, kva med å <a href=\"http://www." "pledgebank.com/new\">publisera ei utfordring om å bidra</a>?</p>" -#: templates/web/default/questionnaire/completed-open.html:1 +#: templates/web/default/questionnaire/completed-open.html:6 #, fuzzy msgid "" "<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" @@ -317,8 +291,8 @@ msgstr "" "informasjon om status for problemet ditt, ver så snill og kom tilbake\n" "til nettstaden og legg igjen ei oppdatering.</p>" -#: templates/web/default/around/display_location.html:70 -#: templates/web/default/around/display_location.html:72 +#: templates/web/default/around/_report_banner.html:3 +#: templates/web/default/around/_report_banner.html:5 #: templates/web/emptyhomes/around/display_location.html:36 #: templates/web/emptyhomes/around/display_location.html:38 msgid "" @@ -332,17 +306,17 @@ msgstr "" msgid "<strong>%d</strong> live problems" msgstr "<strong>%d</strong> aktive problem" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:172 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:193 #, fuzzy msgid "<strong>No</strong> Let me confirm my report by email" msgstr "<strong>Nei</strong>, la meg stadfesta rapporten min med e-post:" -#: templates/web/fixmystreet/report/display.html:148 +#: templates/web/fixmystreet/report/update-form.html:108 #, fuzzy msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Nei</strong>, la meg stadfesta oppdateringa mi med e-post:" -#: templates/web/fixmystreet/auth/general.html:46 +#: templates/web/fixmystreet/auth/general.html:50 #, fuzzy msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Nei</strong>, det gjer eg ikkje. La meg logga inn med e-post:" @@ -355,17 +329,17 @@ msgstr "<strong>Nei</strong>, det gjer eg ikkje. La meg logga inn med e-post:" msgid "<strong>No</strong>, let me confirm my report by email:" msgstr "<strong>Nei</strong>, la meg stadfesta rapporten min med e-post:" -#: templates/web/default/report/display.html:164 +#: templates/web/default/report/update-form.html:115 msgid "<strong>No</strong>, let me confirm my update by email:" msgstr "<strong>Nei</strong>, la meg stadfesta oppdateringa mi med e-post:" #: templates/web/default/auth/general.html:37 -#: templates/web/default/report/display.html:142 #: templates/web/default/report/new/fill_in_details_form.html:140 -#: templates/web/fixmystreet/auth/general.html:32 -#: templates/web/fixmystreet/auth/general.html:34 -#: templates/web/fixmystreet/report/display.html:131 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:154 +#: templates/web/default/report/update-form.html:93 +#: templates/web/fixmystreet/auth/general.html:36 +#: templates/web/fixmystreet/auth/general.html:38 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:169 +#: templates/web/fixmystreet/report/update-form.html:85 #, fuzzy msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Ja</strong>, eg har eit passord:" @@ -378,11 +352,11 @@ msgstr "<strong>Ja</strong>, eg har eit passord:" msgid "About us" msgstr "Om oss" -#: templates/web/default/admin/council_contacts.html:66 +#: templates/web/default/admin/council_contacts.html:72 msgid "Add new category" msgstr "Legg til ny kategori" -#: templates/web/default/my/my.html:56 templates/web/fixmystreet/my/my.html:56 +#: templates/web/default/my/my.html:56 templates/web/fixmystreet/my/my.html:60 msgid "Added %s" msgstr "La til %s" @@ -399,16 +373,13 @@ msgid "Alert %d disabled (created %s)" msgstr "Varsel %d kobla ut (oppretta %s)" #: templates/web/bromley/report/display.html:207 -#: templates/web/default/report/display.html:214 -#: templates/web/fixmystreet/report/display.html:189 +#: templates/web/default/report/update-form.html:161 +#: templates/web/fixmystreet/report/update-form.html:146 msgid "Alert me to future updates" msgstr "Send meg varsel ved framtidige oppdateringar" -#: templates/web/default/admin/stats.html:5 -msgid "All" -msgstr "Alle" - #: templates/web/default/reports/index.html:3 +#: templates/web/fixmybarangay/reports/index.html:3 #, fuzzy msgid "All Reports" msgstr "Alle rapportar" @@ -421,11 +392,18 @@ msgstr "Alle stadfesta" #: templates/web/bromley/header.html:77 templates/web/default/footer.html:11 #: templates/web/fiksgatami/footer.html:7 #: templates/web/fiksgatami/nn/footer.html:7 +#: templates/web/fixmybarangay/footer.html:20 #: templates/web/fixmystreet/footer.html:49 -#: templates/web/reading/footer.html:8 +#: templates/web/reading/footer.html:8 templates/web/stevenage/footer.html:43 +#: templates/web/zurich/footer.html:12 msgid "All reports" msgstr "Alle rapportar" +#: templates/web/default/admin/stats.html:5 +#, fuzzy +msgid "All reports between %s and %s" +msgstr "%srapportar mellom %s og %s" + #: templates/web/default/report/new/councils_text_some.html:2 msgid "All the information you provide here will be sent to" msgstr "All informasjonen du har lagt inn her vil sendast til" @@ -459,6 +437,8 @@ msgstr "" #: templates/web/default/report/new/fill_in_details_form.html:13 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:6 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:8 +#: templates/web/zurich/report/new/fill_in_details_form.html:6 +#: templates/web/zurich/report/new/fill_in_details_form.html:8 msgid "" "All the information you provide here will be sent to <strong>%s</strong>." msgstr "" @@ -499,10 +479,12 @@ msgid "" msgstr "Er du ein utviklar? Kunne du tenkja deg å bidra til FiksGataMi?" #: templates/web/fixmystreet/footer.html:17 +#: templates/web/stevenage/footer.html:17 msgid "Are you a developer?" msgstr "" #: templates/web/fixmystreet/footer.html:21 +#: templates/web/stevenage/footer.html:21 #, fuzzy msgid "Are you from a council?" msgstr "den lokale administrasjonen" @@ -525,6 +507,16 @@ msgstr "For augneblunken går det berre an å søkja etter og å sjå på rappor msgid "Ban email address" msgstr "Bannlys e-postadresse" +#: templates/web/fixmybarangay/report/new/notes.html:7 +msgid "" +"Be sure to choose the right category, because we use that to determine to " +"whom the report is sent." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1032 +msgid "Bodies" +msgstr "" + #: templates/web/fiksgatami/footer.html:16 #: templates/web/fiksgatami/nn/footer.html:16 msgid "" @@ -538,22 +530,23 @@ msgstr "" msgid "By Date" msgstr "På dato" -#: templates/web/fixmystreet/around/display_location.html:80 -#: templates/web/fixmystreet/around/display_location.html:82 +#: templates/web/fixmystreet/around/_report_banner.html:10 +#: templates/web/fixmystreet/around/_report_banner.html:8 #, fuzzy msgid "Can't see the map? <a href='%s' rel='nofollow'>Skip this step</a>" msgstr "" "<small>Viss du ikkje kan sjå kartet, <a href='%s' rel='nofollow'>hopp over " "dette steget</a>.</small>" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:657 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:631 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: templates/web/bromley/report/new/fill_in_details_form.html:68 -#: templates/web/default/admin/council_contacts.html:35 +#: templates/web/default/admin/council_contacts.html:37 #: templates/web/default/admin/index.html:36 #: templates/web/default/admin/list_flagged.html:14 #: templates/web/default/admin/search_reports.html:17 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:72 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:74 +#: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Category" msgstr "Kategori" @@ -561,14 +554,14 @@ msgstr "Kategori" msgid "Category fix rate for problems > 4 weeks old" msgstr "Løysingsrate fordelt på kategori for problem > 4 veker gamle" -#: templates/web/default/admin/council_contacts.html:72 +#: templates/web/default/admin/council_contacts.html:78 #: templates/web/default/admin/council_edit.html:23 #: templates/web/default/admin/report_edit.html:25 #: templates/web/default/report/new/fill_in_details_form.html:67 msgid "Category:" msgstr "Kategori:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:334 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:336 msgid "Category: %s" msgstr "Kategori: %s" @@ -578,8 +571,8 @@ msgstr "Kategori: %s" msgid "Change Password" msgstr "Byt passord" -#: templates/web/fixmystreet/around/display_location.html:72 -#: templates/web/fixmystreet/around/display_location.html:73 +#: templates/web/default/js/validation_strings.html:22 +#: templates/web/fixmystreet/around/_report_banner.html:2 #, fuzzy msgid "Click map to report a problem" msgstr "Korleis rapportera eit problem" @@ -588,22 +581,22 @@ msgstr "Korleis rapportera eit problem" #: templates/web/bromley/report/display.html:82 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:20 -#: templates/web/default/dashboard/index.html:136 #: templates/web/default/dashboard/index.html:138 -#: templates/web/default/report/display.html:79 -#: templates/web/default/report/display.html:81 +#: templates/web/default/dashboard/index.html:140 +#: templates/web/default/report/update-form.html:30 +#: templates/web/default/report/update-form.html:32 #: templates/web/fixmystreet/report/banner.html:15 -#: templates/web/fixmystreet/report/display.html:74 -#: templates/web/fixmystreet/report/display.html:76 +#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/fixmystreet/report/update-form.html:30 msgid "Closed" msgstr "Lukka" # skal det vera forskjellig tyding frå engelsken her? --KBU -#: perllib/FixMyStreet/DB/Result/Problem.pm:690 +#: perllib/FixMyStreet/DB/Result/Problem.pm:695 msgid "Closed by council" msgstr "(ikkje rapportert til administrasjonen)" -#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:32 +#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:36 msgid "Closed reports" msgstr "Lukka rapportar" @@ -611,8 +604,8 @@ msgstr "Lukka rapportar" msgid "Closed:" msgstr "Lukka:" -#: templates/web/default/around/display_location.html:103 -#: templates/web/default/around/display_location.html:105 +#: templates/web/default/around/tabbed_lists.html:10 +#: templates/web/default/around/tabbed_lists.html:12 msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "Dei næraste problema <small>(innanfor %skm)</small>" @@ -636,23 +629,28 @@ msgstr "Data om merkevaresamarbeid:" msgid "Cobrand:" msgstr "Merkevaresamarbeid:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:358 +#: perllib/FixMyStreet/App/Controller/Admin.pm:365 msgid "Configuration updated" msgstr "Oppsett oppdatert" -#: perllib/FixMyStreet/App/Controller/Admin.pm:372 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 msgid "Configuration updated - contacts will be generated automatically later" msgstr "Oppsett oppdatert - kontaktar vil genererast automatisk seinare" -#: templates/web/default/admin/council_contacts.html:153 +#: templates/web/default/admin/council_edit.html:34 +#, fuzzy +msgid "Configure Endpoint" +msgstr "Sett opp Open311" + +#: templates/web/default/admin/council_contacts.html:168 msgid "Configure Open311" msgstr "Sett opp Open311" -#: templates/web/default/admin/council_contacts.html:105 +#: templates/web/default/admin/council_contacts.html:116 msgid "Configure Open311 integration" msgstr "Sett opp Open311-integrasjon" -#: templates/web/default/admin/council_contacts.html:42 +#: templates/web/default/admin/council_contacts.html:46 msgid "Confirm" msgstr "Stadfest" @@ -660,6 +658,13 @@ msgstr "Stadfest" msgid "Confirm account" msgstr "Stadfest konto" +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:187 +#: templates/web/fixmystreet/report/update-form.html:103 +msgid "" +"Confirm by email below, providing a new password at that point. When you " +"confirm, your password will be updated." +msgstr "" + #: templates/web/default/questionnaire/creator_fixed.html:1 #: templates/web/default/tokens/confirm_problem.html:1 #: templates/web/default/tokens/confirm_problem.html:3 @@ -667,17 +672,23 @@ msgstr "Stadfest konto" #: templates/web/default/tokens/confirm_update.html:3 #: templates/web/emptyhomes/tokens/confirm_problem.html:1 #: templates/web/emptyhomes/tokens/confirm_problem.html:3 +#: templates/web/southampton/tokens/confirm_problem.html:1 +#: templates/web/southampton/tokens/confirm_problem.html:3 msgid "Confirmation" msgstr "Stadfesting" -#: templates/web/default/admin/council_contacts.html:37 -#: templates/web/default/admin/council_contacts.html:82 +#: templates/web/default/admin/council_contacts.html:39 +#: templates/web/default/admin/council_contacts.html:88 #: templates/web/default/admin/council_edit.html:28 -#: templates/web/default/admin/council_edit.html:43 -#: templates/web/default/admin/stats.html:5 +#: templates/web/default/admin/council_edit.html:71 msgid "Confirmed" msgstr "Stadfesta" +#: templates/web/default/admin/stats.html:5 +#, fuzzy +msgid "Confirmed reports between %s and %s" +msgstr "%srapportar mellom %s og %s" + #: templates/web/default/admin/problem_row.html:23 #: templates/web/default/admin/report_edit.html:34 msgid "Confirmed:" @@ -708,8 +719,8 @@ msgstr "Kontakt oss" msgid "Contact the team" msgstr "Kontakt prosjektgruppa" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1150 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1178 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1159 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1187 msgid "Could not find user" msgstr "Kunne ikkje finna brukaren" @@ -720,7 +731,6 @@ msgstr "Kunne ikkje finna brukaren" msgid "Council" msgstr "Administrasjon" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1022 #: templates/web/default/admin/council_list.html:1 msgid "Council contacts" msgstr "Administrasjonskontaktar" @@ -748,7 +758,7 @@ msgstr "Mengd" msgid "Create a report" msgstr "Lag ein rapport" -#: templates/web/default/admin/council_contacts.html:96 +#: templates/web/default/admin/council_contacts.html:107 msgid "Create category" msgstr "Lag kategori" @@ -776,15 +786,16 @@ msgstr "For tida har 1+ sletta" msgid "Dashboard" msgstr "" -#: templates/web/default/admin/council_contacts.html:38 -#: templates/web/default/admin/council_contacts.html:85 +#: templates/web/default/admin/council_contacts.html:40 +#: templates/web/default/admin/council_contacts.html:91 #: templates/web/default/admin/council_edit.html:29 -#: templates/web/default/admin/council_edit.html:44 +#: templates/web/default/admin/council_edit.html:72 msgid "Deleted" msgstr "Sletta" #: templates/web/bromley/report/new/fill_in_details_form.html:54 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:64 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 +#: templates/web/zurich/report/new/fill_in_details_form.html:60 #, fuzzy msgid "Details" msgstr "Detaljar:" @@ -794,14 +805,23 @@ msgstr "Detaljar:" msgid "Details:" msgstr "Detaljar:" +#: templates/web/default/admin/council_contacts.html:41 +msgid "Devolved" +msgstr "" + #: templates/web/default/admin/council_list.html:23 msgid "Diligency prize league table" msgstr "Arbeidshestar" +#: templates/web/fixmystreet/auth/general.html:30 +#, fuzzy +msgid "Do you have a FixMyBarangay password?" +msgstr "Har du eit FiksGataMi-passord?" + #: templates/web/default/auth/general.html:32 -#: templates/web/fixmystreet/auth/general.html:29 -#: templates/web/fixmystreet/report/display.html:128 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:150 +#: templates/web/fixmystreet/auth/general.html:32 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:165 +#: templates/web/fixmystreet/report/update-form.html:82 msgid "Do you have a FixMyStreet password?" msgstr "Har du eit FiksGataMi-passord?" @@ -828,33 +848,32 @@ msgstr "Redigerer oppdatering %d" msgid "Editing user %d" msgstr "Redigerer brukar %d" -#: templates/web/default/admin/council_edit.html:45 +#: templates/web/default/admin/council_edit.html:73 msgid "Editor" msgstr "Oppdatert av" #: templates/web/bromley/report/display.html:126 -#: templates/web/default/admin/council_contacts.html:36 -#: templates/web/default/admin/council_edit.html:42 +#: templates/web/default/admin/council_contacts.html:38 +#: templates/web/default/admin/council_edit.html:70 #: templates/web/default/admin/list_flagged.html:12 #: templates/web/default/admin/list_flagged.html:35 #: templates/web/default/admin/list_updates.html:8 -#: templates/web/default/admin/search_abuse.html:11 #: templates/web/default/admin/search_reports.html:15 #: templates/web/default/admin/search_users.html:13 #: templates/web/fixmystreet/auth/general.html:20 -#: templates/web/fixmystreet/report/display.html:120 +#: templates/web/fixmystreet/report/update-form.html:74 msgid "Email" msgstr "E-post" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1126 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1135 msgid "Email added to abuse list" msgstr "E-post lagd til misbrukliste" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1123 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1132 msgid "Email already in abuse list" msgstr "E-post allereie i misbruklista" -#: templates/web/default/around/display_location.html:85 +#: templates/web/default/around/_updates.html:5 msgid "Email me new local problems" msgstr "Send meg e-post om lokale problem" @@ -862,7 +881,7 @@ msgstr "Send meg e-post om lokale problem" msgid "Email me updates" msgstr "Send meg oppdateringar" -#: templates/web/default/admin/council_contacts.html:77 +#: templates/web/default/admin/council_contacts.html:83 #: templates/web/default/admin/council_edit.html:26 #: templates/web/default/admin/report_edit.html:31 #: templates/web/default/admin/update_edit.html:24 @@ -872,15 +891,15 @@ msgstr "Send meg oppdateringar" msgid "Email:" msgstr "E-post:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:611 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:610 msgid "Empty flat or maisonette" msgstr "Tom leilegheit" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:610 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:609 msgid "Empty house or bungalow" msgstr "Tomt hus eller bungalow" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:613 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:612 msgid "Empty office or other commercial" msgstr "Tomt kontor eller forretningsbygg" @@ -888,11 +907,11 @@ msgstr "Tomt kontor eller forretningsbygg" msgid "Empty property details form" msgstr "Tom eigedom detaljskjema" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:614 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:613 msgid "Empty pub or bar" msgstr "Tom pub eller bar" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:615 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:614 msgid "Empty public building - school, hospital, etc." msgstr "Tom offentleg bygning – skule, sjukehus, osb." @@ -908,6 +927,11 @@ msgstr "Sluttdag:" msgid "End month:" msgstr "Sluttmånad:" +#: perllib/FixMyStreet/Cobrand/Zurich.pm:9 +#, fuzzy +msgid "Enter a Zürich street name" +msgstr "Skriv inn postnummer i nærleiken, eller vegnamn og stad" + # GB – Great Britain? --KBU #: templates/web/emptyhomes/index.html:40 #: templates/web/emptyhomes/index.html:41 @@ -932,22 +956,22 @@ msgid "Enter a nearby street name and area" msgstr "Skriv inn postnummer i nærleiken, eller vegnamn og stad" #: templates/web/default/auth/general.html:64 -#: templates/web/default/report/display.html:171 #: templates/web/default/report/new/fill_in_details_form.html:169 +#: templates/web/default/report/update-form.html:122 msgid "Enter a new password:" msgstr "Skriv inn eit nytt passord:" #: templates/web/bromley/report/display.html:148 #: templates/web/bromley/report/new/fill_in_details_form.html:189 -#: templates/web/fixmystreet/auth/general.html:57 -#: templates/web/fixmystreet/report/display.html:160 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:200 +#: templates/web/fixmystreet/auth/general.html:61 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:221 +#: templates/web/fixmystreet/report/update-form.html:120 #, fuzzy msgid "Enter a password" msgstr "Skriv inn eit nytt passord:" -#: templates/web/default/index.html:33 templates/web/emptyhomes/index.html:58 -#: templates/web/fixmystreet/index.html:41 +#: templates/web/default/index-steps.html:11 +#: templates/web/emptyhomes/index.html:58 msgid "Enter details of the problem" msgstr "Legg inn detaljar om problemet" @@ -961,7 +985,7 @@ msgstr "Legg inn detaljar om problemet" msgid "Error" msgstr "Feil" -#: templates/web/default/admin/council_contacts.html:11 +#: templates/web/default/admin/council_contacts.html:13 #: templates/web/default/admin/council_edit.html:18 msgid "Example postcode %s" msgstr "Postnummerdøme %s" @@ -1006,14 +1030,10 @@ msgstr "Fiks<span id=\"my\">Gata</span>Mi" msgid "FixMyStreet" msgstr "FiksGataMi-administrator:" -#: templates/web/default/admin/header.html:13 +#: templates/web/default/admin/header.html:10 msgid "FixMyStreet admin:" msgstr "FiksGataMi-administrator:" -#: templates/web/default/admin/header.html:3 -msgid "FixMyStreet administration" -msgstr "Fiksgatami-administrasjon" - #: templates/web/default/alert/index.html:11 msgid "" "FixMyStreet has a variety of RSS feeds and email alerts for local problems, " @@ -1050,13 +1070,13 @@ msgstr "" #: templates/web/default/admin/index.html:36 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:20 -#: templates/web/default/dashboard/index.html:136 #: templates/web/default/dashboard/index.html:138 -#: templates/web/default/report/display.html:79 -#: templates/web/default/report/display.html:81 +#: templates/web/default/dashboard/index.html:140 +#: templates/web/default/report/update-form.html:30 +#: templates/web/default/report/update-form.html:32 #: templates/web/fixmystreet/report/banner.html:12 -#: templates/web/fixmystreet/report/display.html:74 -#: templates/web/fixmystreet/report/display.html:76 +#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/fixmystreet/report/update-form.html:30 msgid "Fixed" msgstr "Løyst" @@ -1070,7 +1090,7 @@ msgstr "Løyst – Administrasjon" msgid "Fixed - User" msgstr "Løyst – Brukar" -#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:27 +#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:31 msgid "Fixed reports" msgstr "Løyste rapportar" @@ -1082,6 +1102,7 @@ msgstr "Løyst:" msgid "Flag user" msgstr "Flagg brukar" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1037 #: templates/web/default/admin/search_users.html:15 msgid "Flagged" msgstr "Flagga:" @@ -1092,7 +1113,7 @@ msgid "Flagged:" msgstr "Flagga:" #: templates/web/default/reports/_ward-list.html:3 -#: templates/web/emptyhomes/reports/council.html:19 +#: templates/web/emptyhomes/reports/body.html:19 #: templates/web/fixmystreet/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "Følg ei bydellenkje for å berre sjå rapportar innanfor den bydelen." @@ -1101,11 +1122,18 @@ msgstr "Følg ei bydellenkje for å berre sjå rapportar innanfor den bydelen." msgid "For council(s):" msgstr "For administrasjon(ane):" +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:186 +#: templates/web/fixmystreet/report/update-form.html:102 +#, fuzzy +msgid "Forgotten your password?" +msgstr "Rapportane dine" + #: templates/web/default/faq/faq-en-gb.html:1 #: templates/web/emptyhomes/faq/faq-cy.html:1 #: templates/web/emptyhomes/faq/faq-en-gb.html:1 #: templates/web/fiksgatami/faq/faq-nb.html:1 #: templates/web/fiksgatami/nn/faq/faq-nn.html:1 +#: templates/web/fixmybarangay/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/static/privacy.html:1 #: templates/web/zurich/faq/faq-de.html:1 @@ -1121,7 +1149,7 @@ msgid "GeoRSS on Google Maps" msgstr "GeoRSS på Google Maps" #: templates/web/bromley/report/display.html:30 -#: templates/web/fixmystreet/report/display.html:23 +#: templates/web/fixmystreet/report/display.html:31 #, fuzzy msgid "Get updates" msgstr "Siste oppdatering:" @@ -1139,6 +1167,7 @@ msgid "Get updates of problems in this %s" msgstr "RSS-straum for problem i denne %s-en" #: templates/web/default/alert/_list.html:83 +#: templates/web/fixmybarangay/alert/_list.html:28 #: templates/web/fixmystreet/alert/_list.html:82 msgid "Give me an RSS feed" msgstr "Gje meg ein RSS-straum" @@ -1146,7 +1175,7 @@ msgstr "Gje meg ein RSS-straum" #: templates/web/default/alert/index.html:34 #: templates/web/default/around/postcode_form.html:8 #: templates/web/emptyhomes/index.html:47 -#: templates/web/fixmystreet/around/postcode_form.html:18 +#: templates/web/fixmystreet/around/postcode_form.html:21 msgid "Go" msgstr "Hald fram" @@ -1183,8 +1212,10 @@ msgstr "" #: templates/web/emptyhomes/header.html:28 #: templates/web/fiksgatami/footer.html:9 #: templates/web/fiksgatami/nn/footer.html:9 +#: templates/web/fixmybarangay/footer.html:24 #: templates/web/fixmystreet/footer.html:53 -#: templates/web/reading/footer.html:10 +#: templates/web/reading/footer.html:10 templates/web/stevenage/footer.html:47 +#: templates/web/zurich/footer.html:14 msgid "Help" msgstr "Hjelp" @@ -1195,9 +1226,9 @@ msgstr "Her er dei ulike typane lokale problemvarsel for «%s»." #: templates/web/barnet/header.html:70 templates/web/bromley/header.html:64 #: templates/web/bromley/header.html:99 -#: templates/web/fixmybarangay/header.html.orig:42 -#: templates/web/fixmystreet/header.html:47 -#: templates/web/zurich/header.html:47 +#: templates/web/fixmybarangay/header.html:64 +#: templates/web/fixmystreet/header.html:49 +#: templates/web/stevenage/header.html:97 templates/web/zurich/header.html:47 msgid "Hi %s" msgstr "" @@ -1207,26 +1238,24 @@ msgstr "" msgid "Hidden" msgstr "Skjult" -#: templates/web/default/around/display_location.html:58 -#: templates/web/fixmystreet/around/display_location.html:58 +#: templates/web/default/around/display_location.html:63 msgid "Hide old" msgstr "" -#: templates/web/default/around/display_location.html:53 -#: templates/web/fixmystreet/around/display_location.html:54 +#: templates/web/default/around/display_location.html:58 msgid "Hide pins" msgstr "Skjul nåler" -#: templates/web/default/admin/council_edit.html:38 +#: templates/web/default/admin/council_edit.html:66 msgid "History" msgstr "Historie" -#: templates/web/default/index.html:28 templates/web/emptyhomes/index.html:53 -#: templates/web/fixmystreet/index.html:36 +#: templates/web/default/index-steps.html:1 +#: templates/web/emptyhomes/index.html:53 msgid "How to report a problem" msgstr "Korleis rapportera eit problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:637 +#: perllib/FixMyStreet/App/Controller/Admin.pm:648 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Eg er redd du ikkje kan stadfesta ustadfesta rapportar." @@ -1311,12 +1340,12 @@ msgstr "Ugyldig val av straum" #: templates/web/bromley/report/display.html:82 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:20 -#: templates/web/default/dashboard/index.html:136 #: templates/web/default/dashboard/index.html:138 -#: templates/web/default/report/display.html:79 -#: templates/web/default/report/display.html:81 -#: templates/web/fixmystreet/report/display.html:74 -#: templates/web/fixmystreet/report/display.html:76 +#: templates/web/default/dashboard/index.html:140 +#: templates/web/default/report/update-form.html:30 +#: templates/web/default/report/update-form.html:32 +#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/fixmystreet/report/update-form.html:30 msgid "In Progress" msgstr "Under arbeid" @@ -1349,7 +1378,7 @@ msgstr "Feil has_photo-verdi «%s»" msgid "Invalid agency_responsible value %s" msgstr "Ugyldig agency_responsible-verdi %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:952 msgid "Invalid end date" msgstr "Ugyldig slutt-dato" @@ -1357,7 +1386,7 @@ msgstr "Ugyldig slutt-dato" msgid "Invalid format %s specified." msgstr "Ugyldig format %s oppgjeve." -#: perllib/FixMyStreet/App/Controller/Admin.pm:932 +#: perllib/FixMyStreet/App/Controller/Admin.pm:942 msgid "Invalid start date" msgstr "Ugyldig startdato" @@ -1365,12 +1394,12 @@ msgstr "Ugyldig startdato" #: templates/web/bromley/report/display.html:81 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/dashboard/index.html:136 -#: templates/web/default/dashboard/index.html:137 -#: templates/web/default/report/display.html:79 -#: templates/web/default/report/display.html:80 -#: templates/web/fixmystreet/report/display.html:74 -#: templates/web/fixmystreet/report/display.html:75 +#: templates/web/default/dashboard/index.html:138 +#: templates/web/default/dashboard/index.html:139 +#: templates/web/default/report/update-form.html:30 +#: templates/web/default/report/update-form.html:31 +#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/fixmystreet/report/update-form.html:29 msgid "Investigating" msgstr "Undersøkjer" @@ -1390,11 +1419,11 @@ msgstr "" #: templates/web/bromley/report/display.html:166 #: templates/web/bromley/report/new/fill_in_details_form.html:209 #: templates/web/default/auth/general.html:44 -#: templates/web/default/report/display.html:151 #: templates/web/default/report/new/fill_in_details_form.html:149 -#: templates/web/fixmystreet/auth/general.html:42 -#: templates/web/fixmystreet/report/display.html:144 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:167 +#: templates/web/default/report/update-form.html:102 +#: templates/web/fixmystreet/auth/general.html:46 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:182 +#: templates/web/fixmystreet/report/update-form.html:98 msgid "Keep me signed in on this computer" msgstr "Hugs mi innlogging på denne datamaskina" @@ -1405,7 +1434,7 @@ msgstr "Hugs mi innlogging på denne datamaskina" msgid "Last Name" msgstr "Siste oppdatering:" -#: templates/web/default/admin/council_contacts.html:39 +#: templates/web/default/admin/council_contacts.html:42 msgid "Last editor" msgstr "Sist redigert av" @@ -1417,18 +1446,15 @@ msgstr "Siste oppdatering:" msgid "Last update:" msgstr "Siste oppdatering:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1028 -msgid "List Flagged" -msgstr "Vis flagga" - -#: templates/web/default/admin/council_contacts.html:14 #: templates/web/default/admin/council_contacts.html:16 +#: templates/web/default/admin/council_contacts.html:18 msgid "List all reported problems" msgstr "Vis alle rapporterte problem" #: templates/web/bromley/report/new/fill_in_details_form.html:69 #: templates/web/default/report/new/fill_in_details_form.html:68 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:75 +#: templates/web/zurich/report/new/fill_in_details_form.html:69 msgid "Loading..." msgstr "Lastar …" @@ -1443,6 +1469,8 @@ msgstr "Lastar …" #: templates/web/default/tokens/confirm_alert.html:3 #: templates/web/emptyhomes/alert/index.html:1 #: templates/web/emptyhomes/alert/index.html:3 +#: templates/web/fixmybarangay/alert/index.html:1 +#: templates/web/fixmybarangay/alert/index.html:3 #: templates/web/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "Lokal RSS-straum og e-postvarsel" @@ -1458,13 +1486,14 @@ msgstr "Lokal RSS-straum og e-postvarsel for «%s»" #: templates/web/bromley/header.html:79 templates/web/default/footer.html:13 #: templates/web/fiksgatami/footer.html:8 #: templates/web/fiksgatami/nn/footer.html:8 +#: templates/web/fixmybarangay/footer.html:22 #: templates/web/fixmystreet/footer.html:51 -#: templates/web/reading/footer.html:9 +#: templates/web/reading/footer.html:9 templates/web/stevenage/footer.html:45 msgid "Local alerts" msgstr "Lokale varsel" -#: templates/web/default/index.html:32 templates/web/emptyhomes/index.html:57 -#: templates/web/fixmystreet/index.html:40 +#: templates/web/default/index-steps.html:10 +#: templates/web/emptyhomes/index.html:57 msgid "Locate the problem on a map of the area" msgstr "Lokaliser problemet på kartet over området" @@ -1508,10 +1537,12 @@ msgstr "Fleire problem i nærleiken" #: templates/web/emptyhomes/reports/index.html:10 #: templates/web/fiksgatami/nn/reports/index.html:9 #: templates/web/fiksgatami/reports/index.html:9 -#: templates/web/fixmystreet/auth/general.html:52 -#: templates/web/fixmystreet/report/display.html:177 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:117 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:176 +#: templates/web/fixmybarangay/reports/index.html:19 +#: templates/web/fixmystreet/auth/general.html:56 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:120 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:197 +#: templates/web/fixmystreet/report/update-form.html:134 +#: templates/web/zurich/report/new/fill_in_details_form.html:118 msgid "Name" msgstr "Namn" @@ -1527,7 +1558,7 @@ msgstr "Namn:" msgid "Navigation" msgstr "Navigasjon" -#: perllib/FixMyStreet/Geocode/OSM.pm:159 +#: perllib/FixMyStreet/Geocode/OSM.pm:166 msgid "" "Nearest named road to the pin placed on the map (automatically generated " "using OpenStreetMap): %s%s" @@ -1535,7 +1566,7 @@ msgstr "" "Næraste namngjevne veg til nålen plassert på kartet (automatisk generert ved " "hjelp av OpenStreetMap): %s%s" -#: perllib/FixMyStreet/Cobrand/UK.pm:161 +#: perllib/FixMyStreet/Cobrand/UK.pm:152 msgid "" "Nearest postcode to the pin placed on the map (automatically generated): %s " "(%sm away)" @@ -1543,8 +1574,8 @@ msgstr "" "Næraste postnummer til nålen plassert på kartet (automatisk generert): %s " "(%sm unna)" -#: perllib/FixMyStreet/Cobrand/Default.pm:404 -#: perllib/FixMyStreet/Cobrand/Default.pm:444 +#: perllib/FixMyStreet/Cobrand/Default.pm:407 +#: perllib/FixMyStreet/Cobrand/Default.pm:447 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing " "Maps): %s" @@ -1552,7 +1583,7 @@ msgstr "" "Næraste veg til nålen plassert på karta (automatisk generert ved hjelp av " "Bing Maps): %s" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:245 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:265 #, fuzzy msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing " @@ -1567,11 +1598,12 @@ msgid "Nearly Done! Now check your email..." msgstr "Nesten ferdig! No må du sjekka e-posten din …" #: templates/web/default/reports/index.html:16 +#: templates/web/fixmybarangay/reports/index.html:20 #, fuzzy msgid "New <br>problems" msgstr "Nye problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:314 +#: perllib/FixMyStreet/App/Controller/Admin.pm:320 msgid "New category contact added" msgstr "Ny kategorikontakt lagt til" @@ -1641,8 +1673,9 @@ msgstr "Ny tilstand" msgid "New!" msgstr "Ny!" -#: templates/web/default/admin/council_contacts.html:48 -#: templates/web/default/admin/council_contacts.html:49 +#: templates/web/default/admin/council_contacts.html:52 +#: templates/web/default/admin/council_contacts.html:53 +#: templates/web/default/admin/council_contacts.html:54 #: templates/web/default/admin/council_edit.html:4 #: templates/web/default/admin/list_updates.html:30 #: templates/web/default/admin/list_updates.html:31 @@ -1664,7 +1697,7 @@ msgstr "Nei" msgid "No council" msgstr "Ingen administrasjon" -#: perllib/FixMyStreet/DB/Result/Problem.pm:328 +#: perllib/FixMyStreet/DB/Result/Problem.pm:336 msgid "No council selected" msgstr "Ingen administrasjon er vald" @@ -1694,6 +1727,14 @@ msgstr "Fann ingen problem." msgid "No problems have been reported yet." msgstr "Ingen problem er rapporterte" +#: templates/web/default/report/_support.html:3 +msgid "No supporters" +msgstr "" + +#: templates/web/default/admin/council_contacts.html:57 +msgid "Non Public" +msgstr "" + #: templates/web/default/admin/council_list.html:5 #: templates/web/default/admin/report_edit.html:16 msgid "None" @@ -1703,14 +1744,13 @@ msgstr "Ingen" msgid "Not reported before" msgstr "Ikkje rapportert tidlegare" -#: templates/web/default/report/_main.html:11 +#: templates/web/default/report/_main.html:14 #: templates/web/emptyhomes/report/display.html:24 -#: templates/web/fixmystreet/report/_main.html:13 msgid "Not reported to council" msgstr "Ikkje rapportert til administrasjonen" -#: templates/web/default/admin/council_contacts.html:40 -#: templates/web/default/admin/council_edit.html:46 +#: templates/web/default/admin/council_contacts.html:43 +#: templates/web/default/admin/council_edit.html:74 msgid "Note" msgstr "Merk" @@ -1724,8 +1764,8 @@ msgstr "" "var oppretta. Det treng vera den same månaden som rapporten var stadfesta, " "så tala kan hoppa litt opp og ned." -#: templates/web/default/admin/council_contacts.html:89 -#: templates/web/default/admin/council_edit.html:31 +#: templates/web/default/admin/council_contacts.html:95 +#: templates/web/default/admin/council_edit.html:32 msgid "Note:" msgstr "Merk:" @@ -1733,7 +1773,7 @@ msgstr "Merk:" msgid "Note: <strong>%s</strong>" msgstr "Merk: <strong>%s</strong>" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:149 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:164 #, fuzzy msgid "Now to submit your report…" msgstr "På tide å senda rapporten din, har du eit FiksGataMi-passord?" @@ -1742,12 +1782,12 @@ msgstr "På tide å senda rapporten din, har du eit FiksGataMi-passord?" msgid "Now to submit your report… do you have a FixMyStreet password?" msgstr "På tide å senda rapporten din, har du eit FiksGataMi-passord?" -#: templates/web/fixmystreet/report/display.html:127 +#: templates/web/fixmystreet/report/update-form.html:81 #, fuzzy msgid "Now to submit your update…" msgstr "På tide å registrera oppdateringa di, har du eit FiksGataMi-passord?" -#: templates/web/default/report/display.html:133 +#: templates/web/default/report/update-form.html:84 msgid "Now to submit your update… do you have a FixMyStreet password?" msgstr "På tide å registrera oppdateringa di, har du eit FiksGataMi-passord?" @@ -1757,6 +1797,7 @@ msgid "Offensive? Unsuitable? Tell us" msgstr "Støytande? Upassende? Sei frå" #: templates/web/default/reports/index.html:18 +#: templates/web/fixmybarangay/reports/index.html:22 #, fuzzy msgid "Old / unknown <br>problems" msgstr "Ukjend problem-ID" @@ -1771,11 +1812,13 @@ msgid "Old state" msgstr "Gammal tilstand" #: templates/web/default/reports/index.html:20 +#: templates/web/fixmybarangay/reports/index.html:24 #, fuzzy msgid "Older <br>fixed" msgstr "Eldre løyste" #: templates/web/default/reports/index.html:17 +#: templates/web/fixmybarangay/reports/index.html:21 #, fuzzy msgid "Older <br>problems" msgstr "Eldre problem" @@ -1795,13 +1838,13 @@ msgstr "Eldre problem" #: templates/web/bromley/report/display.html:80 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/update_edit.html:19 -#: templates/web/default/dashboard/index.html:136 -#: templates/web/default/report/display.html:79 -#: templates/web/fixmystreet/report/display.html:74 +#: templates/web/default/dashboard/index.html:138 +#: templates/web/default/report/update-form.html:30 +#: templates/web/fixmystreet/report/update-form.html:28 msgid "Open" msgstr "Opne" -#: templates/web/default/my/my.html:22 templates/web/fixmystreet/my/my.html:22 +#: templates/web/default/my/my.html:22 templates/web/fixmystreet/my/my.html:26 msgid "Open reports" msgstr "Opne rapportar" @@ -1831,15 +1874,15 @@ msgstr "" "Eller du kan abonnera på varsel basert på bydel eller administrasjon du " "høyrer til under:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:655 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1006 #: perllib/FixMyStreet/App/Controller/Report/New.pm:656 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:497 -#: perllib/FixMyStreet/DB/Result/Problem.pm:507 -#: perllib/FixMyStreet/DB/Result/Problem.pm:517 -#: perllib/FixMyStreet/DB/Result/Problem.pm:529 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:329 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:338 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:657 +#: perllib/FixMyStreet/DB/Result/Problem.pm:505 +#: perllib/FixMyStreet/DB/Result/Problem.pm:515 +#: perllib/FixMyStreet/DB/Result/Problem.pm:525 +#: perllib/FixMyStreet/DB/Result/Problem.pm:537 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:331 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:340 msgid "Other" msgstr "Anna" @@ -1867,9 +1910,9 @@ msgstr "Delvis" #: templates/web/bromley/report/display.html:145 #: templates/web/bromley/report/new/fill_in_details_form.html:186 -#: templates/web/fixmystreet/auth/general.html:55 -#: templates/web/fixmystreet/report/display.html:157 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:197 +#: templates/web/fixmystreet/auth/general.html:59 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:218 +#: templates/web/fixmystreet/report/update-form.html:117 #, fuzzy msgid "Password (optional)" msgstr "(valfritt)" @@ -1880,13 +1923,14 @@ msgstr "Passord:" #: templates/web/bromley/report/new/fill_in_details_form.html:136 #: templates/web/bromley/report/new/fill_in_details_form.html:183 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:133 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:194 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:148 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:215 +#: templates/web/zurich/report/new/fill_in_details_form.html:124 #, fuzzy msgid "Phone number (optional)" msgstr "(valfritt)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:260 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:262 #: templates/web/default/admin/report_edit.html:32 #: templates/web/default/report/new/fill_in_details_form.html:215 msgid "Phone:" @@ -1894,15 +1938,16 @@ msgstr "Telefon:" #: templates/web/bromley/report/display.html:109 #: templates/web/bromley/report/new/fill_in_details_form.html:104 -#: templates/web/fixmystreet/report/display.html:103 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:108 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:92 +#: templates/web/fixmystreet/report/update-form.html:57 +#: templates/web/zurich/report/new/fill_in_details_form.html:86 #, fuzzy msgid "Photo" msgstr "Bilete:" #: templates/web/default/questionnaire/index.html:95 -#: templates/web/default/report/display.html:109 #: templates/web/default/report/new/fill_in_details_form.html:102 +#: templates/web/default/report/update-form.html:60 #: templates/web/fixmystreet/questionnaire/index.html:90 msgid "Photo:" msgstr "Bilete:" @@ -1915,12 +1960,12 @@ msgstr "Bilete av nye problem i nærleiken" #: templates/web/bromley/report/display.html:81 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/dashboard/index.html:136 -#: templates/web/default/dashboard/index.html:137 -#: templates/web/default/report/display.html:79 -#: templates/web/default/report/display.html:80 -#: templates/web/fixmystreet/report/display.html:74 -#: templates/web/fixmystreet/report/display.html:75 +#: templates/web/default/dashboard/index.html:138 +#: templates/web/default/dashboard/index.html:139 +#: templates/web/default/report/update-form.html:30 +#: templates/web/default/report/update-form.html:31 +#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/fixmystreet/report/update-form.html:29 msgid "Planned" msgstr "Planlagt" @@ -1952,16 +1997,16 @@ msgstr "Ver venleg og sjekk e-posten du oppgav" msgid "Please check your email address is correct" msgstr "Ver venleg og sjekk at du har skrive ei gyldig e-postadresse" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:819 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:826 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:845 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:884 -#: perllib/FixMyStreet/DB/Result/Problem.pm:347 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:822 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:829 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:848 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:891 +#: perllib/FixMyStreet/DB/Result/Problem.pm:355 #: templates/web/default/js/validation_strings.html:9 msgid "Please choose a category" msgstr "Vel ein kategori" -#: perllib/FixMyStreet/DB/Result/Problem.pm:353 +#: perllib/FixMyStreet/DB/Result/Problem.pm:361 msgid "Please choose a property type" msgstr "Vel ein type eigenskap" @@ -1985,9 +2030,10 @@ msgstr "" #: templates/web/default/report/new/notes.html:7 #: templates/web/fixmystreet/report/new/notes.html:6 +#, fuzzy msgid "" -"Please do not be abusive — abusing your council devalues the service " -"for all users." +"Please do not be abusive — abusing your council devalues the " +"service for all users." msgstr "" "Ikkje ver ufin — å kjefta på administrasjonen din skader verdet av " "tenesta for alle brukarane." @@ -2003,7 +2049,7 @@ msgid "Please enter a password" msgstr "Skriv inn eit passord" #: perllib/FixMyStreet/App/Controller/Contact.pm:97 -#: perllib/FixMyStreet/DB/Result/Problem.pm:322 +#: perllib/FixMyStreet/DB/Result/Problem.pm:330 #: templates/web/default/js/validation_strings.html:3 msgid "Please enter a subject" msgstr "Ver venleg og legg inn eit emne" @@ -2019,7 +2065,7 @@ msgstr "Ver venleg og legg til ein gyldig e-post" msgid "Please enter a valid email address" msgstr "Ver venleg og legg inn e-postadressa di" -#: perllib/FixMyStreet/DB/Result/Problem.pm:325 +#: perllib/FixMyStreet/DB/Result/Problem.pm:333 #: templates/web/default/js/validation_strings.html:4 msgid "Please enter some details" msgstr "Ver venleg og legg inn opplysningar om problemet" @@ -2036,7 +2082,8 @@ msgid "Please enter your email" msgstr "Ver venleg og legg inn e-posten din" #: templates/web/bromley/report/new/fill_in_details_form.html:149 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:146 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:161 +#: templates/web/zurich/report/new/fill_in_details_form.html:110 #, fuzzy msgid "Please enter your email address" msgstr "Ver venleg og legg inn e-posten din" @@ -2046,7 +2093,7 @@ msgstr "Ver venleg og legg inn e-posten din" msgid "Please enter your first name" msgstr "Ver venleg og legg inn namnet ditt" -#: perllib/FixMyStreet/DB/Result/Problem.pm:340 +#: perllib/FixMyStreet/DB/Result/Problem.pm:348 #: templates/web/default/js/validation_strings.html:7 #, fuzzy msgid "" @@ -2059,7 +2106,7 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:95 #: perllib/FixMyStreet/DB/Result/Comment.pm:143 -#: perllib/FixMyStreet/DB/Result/Problem.pm:333 +#: perllib/FixMyStreet/DB/Result/Problem.pm:341 #: perllib/FixMyStreet/DB/Result/User.pm:97 #: templates/web/default/js/validation_strings.html:6 msgid "Please enter your name" @@ -2090,11 +2137,28 @@ msgstr "" #: templates/web/default/report/new/fill_in_details_text.html:1 #: templates/web/default/report/new/fill_in_details_text.html:11 +#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1 +#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 -#: templates/web/fixmystreet/report/new/fill_in_details_text.html:11 +#: templates/web/fixmystreet/report/new/fill_in_details_text.html:8 msgid "Please fill in details of the problem below." msgstr "Ver venleg og fyll ut detaljar om problemet under." +#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1 +#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:3 +#, fuzzy +msgid "" +"Please fill in details of the problem below. Leave as much detail as you " +"can, \n" +"and if possible describe the exact location of\n" +"the problem (e.g. if there is a streetlight number or road name)." +msgstr "" +"Ver venlg og fyll inn detaljane om problemet under. Administrasjonen\n" +"vil ikkje vera i stand til å hjelpa med mindre du legg inn så mange\n" +"detaljar som du kan. Forklar den eksakte plasseringa for problemet\n" +"(t.d. på ein vegg), kva det er, kor lenge det har vore der, ei\n" +"skildring (og eit bilete av problemet viss du har eit), osb." + #: templates/web/default/report/new/fill_in_details_text.html:1 #: templates/web/default/report/new/fill_in_details_text.html:3 msgid "" @@ -2111,14 +2175,16 @@ msgstr "" "(t.d. på ein vegg), kva det er, kor lenge det har vore der, ei\n" "skildring (og eit bilete av problemet viss du har eit), osb." -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:68 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:70 +#: templates/web/zurich/report/new/fill_in_details_form.html:64 #, fuzzy msgid "Please fill in details of the problem." msgstr "Ver venleg og fyll ut detaljar om problemet under." #: templates/web/bromley/report/new/fill_in_details_form.html:28 #: templates/web/default/report/new/fill_in_details_form.html:27 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:34 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:35 +#: templates/web/zurich/report/new/fill_in_details_form.html:35 msgid "" "Please fill in the form below with details of the problem, and describe the " "location as precisely as possible in the details box." @@ -2126,7 +2192,7 @@ msgstr "" "Ver venleg og fyll inn skjemaet under med detaljane om problemet,\n" "og skildra plasseringa så nøyaktig som mogleg i boksen for detaljar." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Ver venleg og indiker om du ynskjer å motta eit nytt spørjeskjema" @@ -2134,7 +2200,7 @@ msgstr "Ver venleg og indiker om du ynskjer å motta eit nytt spørjeskjema" msgid "Please note that updates are not sent to the council." msgstr "" -#: templates/web/default/report/display.html:56 +#: templates/web/default/report/update-form.html:7 msgid "" "Please note that updates are not sent to the council. If you leave your name " "it will be public. Your information will only be used in accordance with our " @@ -2159,7 +2225,8 @@ msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:23 #: templates/web/default/report/new/fill_in_details_form.html:5 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:25 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:26 +#: templates/web/zurich/report/new/fill_in_details_form.html:26 msgid "" "Please note your report has <strong>not yet been sent</strong>. Choose a " "category and add further information below, then submit." @@ -2168,22 +2235,23 @@ msgstr "" "og legg til meir informasjon under før du sender inn." #: templates/web/default/report/new/notes.html:1 +#: templates/web/fixmybarangay/report/new/notes.html:1 #: templates/web/fixmystreet/report/new/notes.html:1 msgid "Please note:" msgstr "Merk:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:244 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:246 msgid "Please provide some explanation as to why you're reopening this report" msgstr "" "Ver venleg og bidra med ei forklaring på kvifor du gjenopnar denne " "problemrapporten" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:251 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 msgid "Please provide some text as well as a photo" msgstr "Ver venleg og bidra med litt tekst i tillegg til eit bilete" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:237 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239 msgid "" "Please say whether you've ever reported a problem to your council before" msgstr "" @@ -2198,7 +2266,7 @@ msgstr "Vel den kjelda du ynskjer" msgid "Please select the type of alert you want" msgstr "Ver venleg og vel kva for ein type varsel du ynskjer" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:233 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235 msgid "Please state whether or not the problem has been fixed" msgstr "Ver venleg og oppgje om dette problemet har vorte fiksa eller ikkje" @@ -2206,11 +2274,11 @@ msgstr "Ver venleg og oppgje om dette problemet har vorte fiksa eller ikkje" msgid "Please take a look at the updates that have been left." msgstr "Ver venleg og sjå over oppdateringane som er lagt inn." -#: perllib/FixMyStreet/App/Controller/Photo.pm:176 +#: perllib/FixMyStreet/App/Controller/Photo.pm:175 msgid "Please upload a JPEG image only" msgstr "Ver venleg og berre last opp JPEG-bilete" -#: perllib/FixMyStreet/App/Controller/Photo.pm:183 +#: perllib/FixMyStreet/App/Controller/Photo.pm:182 #, fuzzy msgid "Please upload a JPEG image only\n" msgstr "Ver venleg og berre last opp JPEG-bilete" @@ -2220,7 +2288,7 @@ msgid "Please write a message" msgstr "Skriv inn ei melding" #: templates/web/bromley/report/display.html:70 -#: templates/web/fixmystreet/report/display.html:69 +#: templates/web/fixmystreet/report/update-form.html:23 #, fuzzy msgid "Please write your update here" msgstr "Skriv inn ei melding" @@ -2229,13 +2297,13 @@ msgstr "Skriv inn ei melding" #: templates/web/bromley/report/display.html:149 #: templates/web/bromley/report/display.html:161 #: templates/web/default/contact/index.html:93 -#: templates/web/default/report/display.html:119 -#: templates/web/default/report/display.html:156 -#: templates/web/default/report/display.html:178 +#: templates/web/default/report/update-form.html:107 +#: templates/web/default/report/update-form.html:129 +#: templates/web/default/report/update-form.html:70 #: templates/web/fixmystreet/contact/index.html:93 -#: templates/web/fixmystreet/report/display.html:115 -#: templates/web/fixmystreet/report/display.html:139 -#: templates/web/fixmystreet/report/display.html:161 +#: templates/web/fixmystreet/report/update-form.html:121 +#: templates/web/fixmystreet/report/update-form.html:69 +#: templates/web/fixmystreet/report/update-form.html:93 msgid "Post" msgstr "Send inn" @@ -2251,6 +2319,12 @@ msgstr "Lagt inn av %s (<strong>%s</strong>) %s" msgid "Posted by %s at %s" msgstr "Sendt inn av %s %s" +#: templates/web/default/admin/council_contacts.html:100 +#: templates/web/default/admin/council_edit.html:30 +#: templates/web/default/admin/report_edit.html:43 +msgid "Private" +msgstr "" + #: templates/web/default/maps/openlayers.html:85 msgid "Problem" msgstr "Problem" @@ -2271,7 +2345,7 @@ msgstr "Problem %s sendt til administrasjon %s" msgid "Problem breakdown by state" msgstr "Tilstandsfordeling av problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:819 +#: perllib/FixMyStreet/App/Controller/Admin.pm:849 msgid "Problem marked as open." msgstr "Problem markert som ope." @@ -2283,18 +2357,18 @@ msgstr "Endring av problemtilstand basert på spørjeundersøkingsresultat" msgid "Problems" msgstr "Problem" -#: templates/web/default/around/display_location.html:81 +#: templates/web/default/around/_updates.html:1 msgid "Problems in this area" msgstr "Problem i dette området" #: templates/web/bromley/report/display.html:31 -#: templates/web/fixmystreet/around/display_location.html:98 -#: templates/web/fixmystreet/report/display.html:24 +#: templates/web/fixmystreet/around/tabbed_lists.html:4 +#: templates/web/fixmystreet/report/display.html:35 #, fuzzy msgid "Problems nearby" msgstr "Fleire problem i nærleiken" -#: templates/web/fixmystreet/around/display_location.html:97 +#: templates/web/fixmystreet/around/tabbed_lists.html:3 #, fuzzy msgid "Problems on the map" msgstr "Problem i dette området" @@ -2308,24 +2382,25 @@ msgstr "Problem nyleg rapportert fiksa på FiksGataMi" msgid "Problems within %.1fkm of this location" msgstr "Problem innanfor %.1fkm av denne posisjonen" -#: perllib/FixMyStreet/Cobrand/Default.pm:609 +#: perllib/FixMyStreet/Cobrand/Default.pm:612 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:95 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:162 -#: perllib/FixMyStreet/Cobrand/UK.pm:240 +#: perllib/FixMyStreet/Cobrand/UK.pm:231 msgid "Problems within %s" msgstr "Problem innanfor %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:103 -#: perllib/FixMyStreet/Cobrand/UK.pm:254 +#: perllib/FixMyStreet/Cobrand/UK.pm:245 msgid "Problems within %s ward" msgstr "Problem innanfor %s bydel" -#: templates/web/default/reports/council.html:0 -#: templates/web/default/reports/council.html:29 +#: templates/web/default/reports/body.html:0 +#: templates/web/default/reports/body.html:29 msgid "Problems within %s, FixMyStreet" msgstr "Problem innanfor %s, FiksGataMi" #: templates/web/default/alert/_list.html:40 +#: templates/web/fixmybarangay/alert/_list.html:13 #: templates/web/fixmystreet/alert/_list.html:42 msgid "Problems within the boundary of:" msgstr "Problem innanfor grensene av:" @@ -2334,19 +2409,19 @@ msgstr "Problem innanfor grensene av:" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "Eigedomar nyleg rapportert som tilbake i bruk på reportemptyhomes.com" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:617 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:616 msgid "Property type:" msgstr "Type eigenskap:" #: templates/web/bromley/report/new/fill_in_details_form.html:52 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:62 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:64 #, fuzzy msgid "Provide a title" msgstr "Bidra med ei oppdatering" #: templates/web/bromley/report/display.html:57 -#: templates/web/default/report/display.html:51 -#: templates/web/fixmystreet/report/display.html:50 +#: templates/web/default/report/update-form.html:3 +#: templates/web/fixmystreet/report/update-form.html:4 msgid "Provide an update" msgstr "Bidra med ei oppdatering" @@ -2361,10 +2436,10 @@ msgstr "" "oversyn over rapportane dine" #: templates/web/bromley/report/display.html:142 -#: templates/web/default/report/display.html:175 #: templates/web/default/report/new/fill_in_details_form.html:173 -#: templates/web/fixmystreet/report/display.html:154 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:191 +#: templates/web/default/report/update-form.html:126 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:212 +#: templates/web/fixmystreet/report/update-form.html:114 msgid "" "Providing a password is optional, but doing so will allow you to more easily " "report problems, leave updates and manage your reports." @@ -2373,6 +2448,11 @@ msgstr "" "enklare for deg å rapportera problem, leggja inn oppdateringar og halda " "oversyn over rapportane dine" +#: templates/web/default/admin/council_contacts.html:44 +#: templates/web/default/admin/council_contacts.html:57 +msgid "Public" +msgstr "" + #: templates/web/default/questionnaire/completed.html:1 #: templates/web/default/questionnaire/completed.html:2 #: templates/web/default/questionnaire/index.html:0 @@ -2393,7 +2473,7 @@ msgstr "Spørjeskjema %d fylt inn for problem %d, %s til %s" msgid "Questionnaire %d sent for problem %d" msgstr "Spørjeskjema %d sendt for problem %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:190 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "Spørjeskjema fylt inn av feilrapportøren" @@ -2405,17 +2485,15 @@ msgstr "Spørjeskjema fylt inn av feilrapportøren" #: templates/web/default/reports/_rss.html:1 #: templates/web/fixmystreet/alert/_list.html:22 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/around/display_location.html:1 -#: templates/web/fixmystreet/around/display_location.html:3 -#: templates/web/fixmystreet/report/display.html:30 +#: templates/web/fixmystreet/report/display.html:49 msgid "RSS feed" msgstr "RSS-straum" -#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 +#: perllib/FixMyStreet/Cobrand/UK.pm:274 perllib/FixMyStreet/Cobrand/UK.pm:286 msgid "RSS feed for %s" msgstr "RSS-straum for %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:289 perllib/FixMyStreet/Cobrand/UK.pm:301 +#: perllib/FixMyStreet/Cobrand/UK.pm:280 perllib/FixMyStreet/Cobrand/UK.pm:292 msgid "RSS feed for %s ward, %s" msgstr "RSS-straum for %s bydel, %s" @@ -2423,11 +2501,11 @@ msgstr "RSS-straum for %s bydel, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:186 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:196 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:204 -#: perllib/FixMyStreet/Cobrand/UK.pm:309 perllib/FixMyStreet/Cobrand/UK.pm:321 +#: perllib/FixMyStreet/Cobrand/UK.pm:300 perllib/FixMyStreet/Cobrand/UK.pm:312 msgid "RSS feed of %s" msgstr "RSS-straum frå %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:314 perllib/FixMyStreet/Cobrand/UK.pm:326 +#: perllib/FixMyStreet/Cobrand/UK.pm:305 perllib/FixMyStreet/Cobrand/UK.pm:317 msgid "RSS feed of %s, within %s ward" msgstr "RSS-straum av %s, innanfor %s bydel" @@ -2440,29 +2518,27 @@ msgstr "RSS-straum med problem i nærleiken" msgid "RSS feed of problems in this %s" msgstr "RSS-straum for problem i denne %s-en" -#: perllib/FixMyStreet/Cobrand/Default.pm:610 +#: perllib/FixMyStreet/Cobrand/Default.pm:613 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:96 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161 -#: perllib/FixMyStreet/Cobrand/UK.pm:247 +#: perllib/FixMyStreet/Cobrand/UK.pm:238 msgid "RSS feed of problems within %s" msgstr "RSS-straum for problem innanfor %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:102 -#: perllib/FixMyStreet/Cobrand/UK.pm:253 +#: perllib/FixMyStreet/Cobrand/UK.pm:244 msgid "RSS feed of problems within %s ward" msgstr "RSS-straum for problem innanfor %s bydel" #: templates/web/default/around/display_location.html:1 #: templates/web/default/around/display_location.html:4 -#: templates/web/fixmystreet/around/display_location.html:1 -#: templates/web/fixmystreet/around/display_location.html:4 msgid "RSS feed of recent local problems" msgstr "RSS-straum med nye lokale problem" #: templates/web/bromley/report/display.html:37 #: templates/web/default/report/display.html:42 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:30 +#: templates/web/fixmystreet/report/display.html:49 msgid "RSS feed of updates to this problem" msgstr "RSS-straum med oppdateringar for dette problemet" @@ -2470,18 +2546,17 @@ msgstr "RSS-straum med oppdateringar for dette problemet" #: templates/web/default/alert/updates.html:9 #: templates/web/default/report/display.html:33 #: templates/web/fixmystreet/alert/updates.html:14 -#: templates/web/fixmystreet/report/display.html:32 +#: templates/web/fixmystreet/report/display.html:51 msgid "Receive email when updates are left on this problem." msgstr "Motta e-post når det er oppdateringar på dette problemet" #: templates/web/default/around/display_location.html:0 #: templates/web/default/around/display_location.html:34 -#: templates/web/fixmystreet/around/display_location.html:0 -#: templates/web/fixmystreet/around/display_location.html:34 msgid "Recent local problems, FixMyStreet" msgstr "Nye lokale problem, FiksGataMi." #: templates/web/default/reports/index.html:19 +#: templates/web/fixmybarangay/reports/index.html:23 #, fuzzy msgid "Recently <br>fixed" msgstr "Nyleg løyste problem" @@ -2492,7 +2567,7 @@ msgstr "Nyleg løyste problem" msgid "Recently fixed" msgstr "Nyleg løyste problem" -#: templates/web/default/index.html:50 templates/web/fixmystreet/index.html:62 +#: templates/web/default/index.html:37 templates/web/fixmystreet/index.html:45 msgid "Recently reported problems" msgstr "Nyleg melde problem" @@ -2509,11 +2584,17 @@ msgstr "" "tenesta, hugs at du kan kontakta administrasjonen direkte via deira eiga " "nettside." +#: templates/web/fixmybarangay/report/new/notes.html:9 +msgid "" +"Remember that, for the pilot project, FixMyBarangay is only for reporting " +"potholes and streetlights in bgy. Luz or Basak San Nicolas." +msgstr "" + #: templates/web/default/admin/report_blocks.html:16 msgid "Remove flag" msgstr "Fjern flagg" -#: templates/web/default/admin/report_edit.html:53 +#: templates/web/default/admin/report_edit.html:54 #: templates/web/default/admin/update_edit.html:48 msgid "Remove photo (can't be undone!)" msgstr "Fjern bilete (kan ikkje gjerast om!)" @@ -2527,12 +2608,13 @@ msgstr "Rapporter tomme heimar" #: templates/web/fiksgatami/footer.html:5 #: templates/web/fiksgatami/nn/footer.html:5 #: templates/web/fixmystreet/footer.html:45 -#: templates/web/reading/footer.html:6 +#: templates/web/reading/footer.html:6 templates/web/stevenage/footer.html:39 +#: templates/web/zurich/footer.html:10 msgid "Report a problem" msgstr "Rapporter eit problem" #: templates/web/bromley/report/display.html:28 -#: templates/web/fixmystreet/report/display.html:22 +#: templates/web/fixmystreet/report/display.html:29 #, fuzzy msgid "Report abuse" msgstr "Rapporter eit problem" @@ -2542,12 +2624,14 @@ msgstr "Rapporter eit problem" msgid "Report empty properties" msgstr "Rapporter tomme heimar" -#: perllib/FixMyStreet/App/Controller/Rss.pm:277 +#: perllib/FixMyStreet/App/Controller/Rss.pm:286 msgid "Report on %s" msgstr "Rapport på %s" #: templates/web/default/index.html:15 -#: templates/web/fixmystreet/around/postcode_form.html:6 +#: templates/web/fixmystreet/around/intro.html:1 +#: templates/web/stevenage/around/intro.html:1 +#: templates/web/zurich/around/intro.html:1 msgid "Report, view, or discuss local problems" msgstr "Rapporter, finn eller diskuter lokale problem" @@ -2559,7 +2643,7 @@ msgstr "Rapportert %s" msgid "Reported %s, to %s" msgstr "Rapportert %s, til %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:512 +#: perllib/FixMyStreet/DB/Result/Problem.pm:520 #: templates/web/default/contact/index.html:45 #: templates/web/fixmystreet/contact/index.html:46 msgid "Reported anonymously at %s" @@ -2571,33 +2655,33 @@ msgstr "Rapportert anonymt %s" msgid "Reported before" msgstr "Rapportert tidlegare" -#: perllib/FixMyStreet/DB/Result/Problem.pm:504 +#: perllib/FixMyStreet/DB/Result/Problem.pm:512 msgid "Reported by %s anonymously at %s" msgstr "Publisert av %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:535 +#: perllib/FixMyStreet/DB/Result/Problem.pm:543 #: templates/web/default/contact/index.html:47 #: templates/web/fixmystreet/contact/index.html:48 msgid "Reported by %s at %s" msgstr "Publisert av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:526 +#: perllib/FixMyStreet/DB/Result/Problem.pm:534 msgid "Reported by %s by %s at %s" msgstr "Rapportert av %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:500 +#: perllib/FixMyStreet/DB/Result/Problem.pm:508 msgid "Reported by %s in the %s category anonymously at %s" msgstr "Rapportert av %s i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:520 +#: perllib/FixMyStreet/DB/Result/Problem.pm:528 msgid "Reported by %s in the %s category by %s at %s" msgstr "Rapportert av %s i kategorien %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:508 +#: perllib/FixMyStreet/DB/Result/Problem.pm:516 msgid "Reported in the %s category anonymously at %s" msgstr "Rapportert i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:530 +#: perllib/FixMyStreet/DB/Result/Problem.pm:538 msgid "Reported in the %s category by %s at %s" msgstr "Rapportert i kategorien %s av %s %s" @@ -2609,10 +2693,16 @@ msgstr "Rapportert i kategorien %s av %s %s" #: templates/web/fixmystreet/report/new/fill_in_details.html:0 #: templates/web/fixmystreet/report/new/fill_in_details.html:5 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 +#: templates/web/zurich/report/new/fill_in_details_form.html:2 msgid "Reporting a problem" msgstr "Legger til eit problem" -#: templates/web/default/around/display_location.html:95 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1033 +#, fuzzy +msgid "Reports" +msgstr "Alle rapportar" + +#: templates/web/default/around/tabbed_lists.html:3 msgid "Reports on and around the map" msgstr "Problem i og rundt kartet" @@ -2620,7 +2710,7 @@ msgstr "Problem i og rundt kartet" msgid "Resend report" msgstr "Send rapport på nytt" -#: perllib/FixMyStreet/Geocode/OSM.pm:166 +#: perllib/FixMyStreet/Geocode/OSM.pm:173 msgid "" "Road operator for this named road (derived from road reference number and " "type): %s" @@ -2628,34 +2718,23 @@ msgstr "" "Vegoperatør for denne namngjevne vegen (utleia frå vegreferansenummer og " "type): %s" -#: perllib/FixMyStreet/Geocode/OSM.pm:163 +#: perllib/FixMyStreet/Geocode/OSM.pm:170 msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Vegoperatør for denne namngjevne vegen (frå OpenStreetMap): %s" -#: templates/web/default/admin/council_edit.html:35 +#: templates/web/default/admin/council_edit.html:63 msgid "Save changes" msgstr "Lagra endringar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1027 -msgid "Search Abuse" -msgstr "Søk etter misbruk" - -#: templates/web/default/admin/search_abuse.html:1 -msgid "Search Abuse Table" -msgstr "Søk i misbruktabell" - -#: perllib/FixMyStreet/App/Controller/Admin.pm:1023 #: templates/web/default/admin/list_flagged.html:1 #: templates/web/default/admin/search_reports.html:1 msgid "Search Reports" msgstr "Søk i rapportar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1026 #: templates/web/default/admin/search_users.html:1 msgid "Search Users" msgstr "Søk i brukarar" -#: templates/web/default/admin/search_abuse.html:4 #: templates/web/default/admin/search_reports.html:5 #: templates/web/default/admin/search_users.html:5 msgid "Search:" @@ -2670,7 +2749,7 @@ msgstr "" "Vel kva for ein type varsel du ynskjer og klikk på knappen for ei RSS-" "kjelde, eller skriv inn e-postadressa di for å abonnera på eit e-postvarsel." -#: perllib/FixMyStreet/DB/Result/Problem.pm:618 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 msgid "Sent to %s %s later" msgstr "Sendt til %s %s seinare" @@ -2682,6 +2761,10 @@ msgstr "Sendt:" msgid "Service:" msgstr "Teneste:" +#: templates/web/fixmystreet/report/display.html:33 +msgid "Share" +msgstr "" + #: templates/web/emptyhomes/static/about.html:21 msgid "Shelter Cymru" msgstr "Shelter Cymru" @@ -2706,32 +2789,30 @@ msgstr "" #: templates/web/bromley/report/display.html:203 #: templates/web/bromley/report/new/fill_in_details_form.html:129 #: templates/web/bromley/report/new/fill_in_details_form.html:175 -#: templates/web/default/report/display.html:208 #: templates/web/default/report/new/fill_in_details_form.html:210 -#: templates/web/fixmystreet/report/display.html:185 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:126 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:186 +#: templates/web/default/report/update-form.html:155 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:139 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:207 +#: templates/web/fixmystreet/report/update-form.html:142 msgid "Show my name publicly" msgstr "Vis namnet mitt offentleg" -#: templates/web/default/around/display_location.html:60 -#: templates/web/fixmystreet/around/display_location.html:60 +#: templates/web/default/around/display_location.html:65 msgid "Show old" msgstr "" -#: templates/web/default/around/display_location.html:51 -#: templates/web/fixmystreet/around/display_location.html:52 +#: templates/web/default/around/display_location.html:56 msgid "Show pins" msgstr "Vis nåler" #: templates/web/default/auth/general.html:3 #: templates/web/default/auth/general.html:49 -#: templates/web/fixmybarangay/header.html.orig:46 +#: templates/web/fixmybarangay/header.html:68 #: templates/web/fixmystreet/auth/general.html:3 -#: templates/web/fixmystreet/auth/general.html:38 -#: templates/web/fixmystreet/auth/general.html:58 -#: templates/web/fixmystreet/header.html:51 -#: templates/web/zurich/header.html:51 +#: templates/web/fixmystreet/auth/general.html:42 +#: templates/web/fixmystreet/auth/general.html:62 +#: templates/web/fixmystreet/header.html:53 +#: templates/web/stevenage/header.html:101 templates/web/zurich/header.html:51 msgid "Sign in" msgstr "Logg inn" @@ -2750,6 +2831,7 @@ msgstr "Logg inn eller opprett ein konto" #: templates/web/emptyhomes/header.html:41 #: templates/web/fiksgatami/header.html:22 #: templates/web/fiksgatami/nn/header.html:22 +#: templates/web/fixmybarangay/auth/sign_out.html:1 #: templates/web/lichfielddc/header.html:177 #: templates/web/reading/header.html:33 msgid "Sign out" @@ -2765,11 +2847,13 @@ msgid "Signed in as %s" msgstr "Logga inn som %s" #: templates/web/default/report/new/fill_in_details_text.html:1 +#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1 #: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 msgid "Some categories may require additional information." msgstr "Somme kategoriar krev kanskje meir informasjon" #: templates/web/default/alert/index.html:42 +#: templates/web/fixmybarangay/alert/index.html:32 msgid "Some photos of recent reports" msgstr "Nokre bilete av nyleg melde problem" @@ -2782,7 +2866,7 @@ msgstr "Noko tekst å omsetja" msgid "Some unconfirmeds" msgstr "Nokre ustadfesta" -#: perllib/FixMyStreet/Cobrand/UK.pm:97 +#: perllib/FixMyStreet/Cobrand/UK.pm:89 msgid "" "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2795,15 +2879,16 @@ msgstr "" "Orsak, men det oppstod eit problem når vi freista å stadfesta " "problemrapporten din" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:214 -#: perllib/FixMyStreet/Geocode.pm:27 perllib/FixMyStreet/Geocode/Bing.pm:51 -#: perllib/FixMyStreet/Geocode/Google.pm:69 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:211 +#: perllib/FixMyStreet/Geocode.pm:28 perllib/FixMyStreet/Geocode/Bing.pm:58 +#: perllib/FixMyStreet/Geocode/Google.pm:74 +#: perllib/FixMyStreet/Geocode/OSM.pm:66 msgid "Sorry, we could not find that location." msgstr "Orsak, vi kunne ikkje finna den staden." -#: perllib/FixMyStreet/Geocode/Bing.pm:46 -#: perllib/FixMyStreet/Geocode/Google.pm:64 -#: perllib/FixMyStreet/Geocode/OSM.pm:59 +#: perllib/FixMyStreet/Geocode/Bing.pm:53 +#: perllib/FixMyStreet/Geocode/Google.pm:69 +#: perllib/FixMyStreet/Geocode/Zurich.pm:82 msgid "Sorry, we could not parse that location. Please try again." msgstr "" "Orsak, vi kunne ikkje tolka den posisjonen. Ver venleg og prøv på nytt." @@ -2829,17 +2914,17 @@ msgstr "Startmånad:" #: templates/web/default/admin/list_flagged.html:18 #: templates/web/default/admin/list_updates.html:6 #: templates/web/default/admin/search_reports.html:21 -#: templates/web/fixmystreet/report/display.html:72 +#: templates/web/fixmystreet/report/update-form.html:26 msgid "State" msgstr "Tilstand" #: templates/web/default/admin/report_edit.html:17 #: templates/web/default/admin/update_edit.html:18 -#: templates/web/default/report/display.html:77 +#: templates/web/default/report/update-form.html:28 msgid "State:" msgstr "Tilstand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1029 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1038 #: templates/web/default/admin/stats.html:1 msgid "Stats" msgstr "Statistikk" @@ -2851,7 +2936,7 @@ msgstr "Skal spørjeskjemaet sendast?" #: templates/web/bromley/report/new/fill_in_details_form.html:48 #: templates/web/fixmystreet/contact/index.html:79 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:58 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:60 #, fuzzy msgid "Subject" msgstr "Emne:" @@ -2869,13 +2954,14 @@ msgstr "Emne:" #: templates/web/default/report/new/fill_in_details_form.html:114 #: templates/web/default/report/new/fill_in_details_form.html:154 #: templates/web/default/report/new/fill_in_details_form.html:176 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:137 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:162 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:201 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:152 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:177 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:222 +#: templates/web/zurich/report/new/fill_in_details_form.html:128 msgid "Submit" msgstr "Send inn" -#: templates/web/default/admin/report_edit.html:56 +#: templates/web/default/admin/report_edit.html:57 #: templates/web/default/admin/update_edit.html:51 #: templates/web/default/admin/user_edit.html:20 msgid "Submit changes" @@ -2890,16 +2976,24 @@ msgstr "Send inn spørjeskjema" #: templates/web/default/alert/updates.html:17 #: templates/web/default/report/display.html:38 #: templates/web/fixmystreet/alert/updates.html:23 -#: templates/web/fixmystreet/report/display.html:37 +#: templates/web/fixmystreet/report/display.html:56 msgid "Subscribe" msgstr "Abonner" #: templates/web/default/alert/_list.html:97 +#: templates/web/fixmybarangay/alert/_list.html:42 #: templates/web/fixmystreet/alert/_list.html:92 msgid "Subscribe me to an email alert" msgstr "Eg ynskjer å abonnera på e-postvarsel" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1021 +#: templates/web/fixmybarangay/alert/_list.html:6 +#, fuzzy +msgid "Subscribe to an alert based upon what baranagay you’re in:" +msgstr "" +"Eller du kan abonnera på varsel basert på bydel eller administrasjon du " +"høyrer til under:" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1031 #: templates/web/default/admin/index.html:1 msgid "Summary" msgstr "Oppsummering" @@ -2908,10 +3002,15 @@ msgstr "Oppsummering" #: templates/web/emptyhomes/reports/index.html:1 #: templates/web/fiksgatami/nn/reports/index.html:1 #: templates/web/fiksgatami/reports/index.html:1 +#: templates/web/fixmybarangay/reports/index.html:1 msgid "Summary reports" msgstr "Oppsummeringsrapportar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1025 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1035 +#, fuzzy +msgid "Survey" +msgstr "Resultat frå spørjeundersøkinga" + #: templates/web/default/admin/questionnaire.html:1 msgid "Survey Results" msgstr "Resultat frå spørjeundersøkinga" @@ -2920,7 +3019,7 @@ msgstr "Resultat frå spørjeundersøkinga" msgid "Text" msgstr "Tekst" -#: templates/web/default/admin/council_contacts.html:18 +#: templates/web/default/admin/council_contacts.html:20 msgid "Text only version" msgstr "Tekst-utgåve" @@ -3008,13 +3107,13 @@ msgstr "" "Takk, glad for å høyra at problemet er løyst! Vi vil gjerne spørja deg om du " "har rapportert eit problem til ein administrasjon tidlegare?" -#: perllib/FixMyStreet/App/Controller/Photo.pm:190 +#: perllib/FixMyStreet/App/Controller/Photo.pm:189 msgid "" "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" "Biletet ser ikkje ut til å ha vorte lasta opp riktig (%s), prøv på nytt." -#: perllib/FixMyStreet/App/Controller/Council.pm:91 +#: perllib/FixMyStreet/App/Controller/Council.pm:90 #, fuzzy msgid "" "That location does not appear to be covered by a council; perhaps it is " @@ -3023,22 +3122,27 @@ msgstr "" "Den staden vert ikkje dekt av nokon administrasjon, kanskje det er til\n" "havs – ver venleg og prøv ein meir spesifikk stad." -#: perllib/FixMyStreet/App/Controller/Location.pm:107 +#: perllib/FixMyStreet/App/Controller/Location.pm:121 #, fuzzy msgid "That location does not appear to be in the UK; please try again." msgstr "" "Den staden synest ikkje å vera i Storbritannia. Ver venleg og prøv igjen." #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:90 +#: perllib/FixMyStreet/Cobrand/UK.pm:82 msgid "That postcode was not recognised, sorry." msgstr "Det postnummeret vart ikkje gjenkjent, orsak." -#: perllib/FixMyStreet/App/Controller/Admin.pm:605 +#: perllib/FixMyStreet/App/Controller/Admin.pm:616 msgid "That problem will now be resent." msgstr "Det problemet vil no sendast på nytt." -#: perllib/FixMyStreet/App/Controller/Report.pm:75 +#: perllib/FixMyStreet/App/Controller/Report.pm:98 +#, fuzzy +msgid "That report cannot be viewed on FixMyStreet." +msgstr "Den rapporten har vorte fjerna frå FiksGataMi." + +#: perllib/FixMyStreet/App/Controller/Report.pm:92 msgid "That report has been removed from FixMyStreet." msgstr "Den rapporten har vorte fjerna frå FiksGataMi." @@ -3083,14 +3187,11 @@ msgstr "" #: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 #: templates/web/fixmystreet/report/new/fill_in_details_text.html:3 -#, fuzzy msgid "" -"The council won’t be able to help unless you leave as much\n" -"detail as you can. Please describe the exact location of the problem (e.g. " -"on a\n" -"wall), what it is, how long it has been there, a description (and a photo " -"of\n" -"the problem if you have one), etc." +"The council won’t be able to help unless you leave as much detail as " +"you can. Please describe the exact location of the problem (e.g. on a wall), " +"what it is, how long it has been there, a description (and a photo of the " +"problem if you have one), etc." msgstr "" "Ver venlg og fyll inn detaljane om problemet under. Administrasjonen\n" "vil ikkje vera i stand til å hjelpa med mindre du legg inn så mange\n" @@ -3112,8 +3213,8 @@ msgstr "" "Detaljane om problemet ditt er tilgjengelege på høgre kant av denne sida." #: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:44 -#: perllib/FixMyStreet/App/Controller/Reports.pm:75 +#: perllib/FixMyStreet/App/Controller/Reports.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:74 msgid "The error was: %s" msgstr "Feilen var: %s" @@ -3127,7 +3228,7 @@ msgstr "" "service_request_id, description, lat, long, media_url, status, " "requested_datetime, updated_datetime, service_code og service_name." -#: perllib/FixMyStreet/Geocode/OSM.pm:158 +#: perllib/FixMyStreet/Geocode/OSM.pm:165 msgid "" "The following information about the nearest road might be inaccurate or " "irrelevant, if the problem is close to several roads or close to a road " @@ -3210,6 +3311,7 @@ msgstr "Den enklaste meldinga er den geografiske:" #: templates/web/default/report/new/councils_text_some.html:11 #: templates/web/default/report/new/fill_in_details_form.html:17 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 +#: templates/web/zurich/report/new/fill_in_details_form.html:12 msgid "" "The subject and details of the problem will be public, plus your name if you " "give us permission." @@ -3217,7 +3319,7 @@ msgstr "" "Tittelen og detaljane for problemet vil verta offentlege, pluss namnet ditt\n" "viss du gjev oss lov til det." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:269 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:271 msgid "" "The user could not locate the problem on a map, but to see the area around " "the location they entered" @@ -3225,7 +3327,7 @@ msgstr "" "Brukaren kunne ikkje plassera problemet på eit kart, men sjekk områdde rundt " "staden dei skreiv inn" -#: perllib/FixMyStreet/App/Controller/Reports.pm:72 +#: perllib/FixMyStreet/App/Controller/Reports.pm:71 msgid "" "There was a problem showing the All Reports page. Please try again later." msgstr "" @@ -3239,8 +3341,8 @@ msgstr "" "Det oppstod problem med å visa «Alle rapportar»-sida. Ver venleg og prøv " "igjen seinare." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:733 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:130 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:736 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 #: templates/web/default/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:24 #, fuzzy @@ -3261,7 +3363,7 @@ msgstr "" "Det var problem med e-post/passord-kombinasjonen din. Ver venleg og prøv " "igjen." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:256 msgid "There was a problem with your update. Please try again." msgstr "Det var problem med oppdateringa di. Ver venleg og prøv igjen." @@ -3269,7 +3371,7 @@ msgstr "Det var problem med oppdateringa di. Ver venleg og prøv igjen." msgid "There were problems with your report. Please see below." msgstr "Det var problem med rapporten din. Ver venleg og sjå under." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:279 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:283 msgid "There were problems with your update. Please see below." msgstr "Det var problem med oppdateringa di. Ver venleg og sjå under." @@ -3281,7 +3383,7 @@ msgstr "" "Denne API-implementasjonen er under arbeid og ikkje enno stabil. Han vil " "endra seg utan åtvaring i framtida." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:339 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:341 msgid "" "This email has been sent to both councils covering the location of the " "problem, as the user did not categorise it; please ignore it if you're not " @@ -3294,7 +3396,7 @@ msgstr "" "eller gjev oss melding om kva for ein kategori av problem dette er så vi kan " "leggja det til i systemet vårt." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:342 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:344 msgid "" "This email has been sent to several councils covering the location of the " "problem, as the category selected is provided for all of them; please ignore " @@ -3305,8 +3407,8 @@ msgstr "" "og ignorer e-posten viss de ikkje er korrekt administrasjon for å handtera " "denne saka." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:865 -#: perllib/FixMyStreet/Cobrand/UK.pm:62 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:868 +#: perllib/FixMyStreet/Cobrand/UK.pm:54 msgid "This information is required" msgstr "Denne informasjonen er påkravd" @@ -3318,14 +3420,23 @@ msgstr "" "Dette er ein utviklarnettstad. Ting kan knekka når som helst og databasen " "vil verta periodisk sletta." -#: templates/web/emptyhomes/reports/council.html:58 +#: templates/web/emptyhomes/reports/body.html:58 msgid "This is a summary of all reports for one %s." msgstr "Dette er ei oppsummering av alle rapportar for ein %s." -#: templates/web/emptyhomes/reports/council.html:60 +#: templates/web/emptyhomes/reports/body.html:60 msgid "This is a summary of all reports for this %s." msgstr "Dette er ei oppsummering for alle rapportar for denne %s-en." +#: templates/web/fixmybarangay/reports/index.html:7 +#, fuzzy +msgid "" +"This is a summary of all reports on this site; select a particular barangay " +"to see the reports sent there." +msgstr "" +"Dette er ei opplisting av alle problema i denne tenesta; vel ein viss " +"administrasjon for å sjå problem som er sende dit." + #: templates/web/default/reports/index.html:7 #: templates/web/emptyhomes/reports/index.html:4 #: templates/web/fiksgatami/nn/reports/index.html:4 @@ -3343,15 +3454,15 @@ msgstr "Dette problemet er lukka" #: templates/web/bromley/report/display.html:96 #: templates/web/default/report/banner.html:12 -#: templates/web/default/report/display.html:95 +#: templates/web/default/report/update-form.html:46 #: templates/web/emptyhomes/report/display.html:12 -#: templates/web/fixmystreet/report/display.html:90 +#: templates/web/fixmystreet/report/update-form.html:44 msgid "This problem has been fixed" msgstr "Dette problemet er løyst" #: templates/web/bromley/report/display.html:90 -#: templates/web/default/report/display.html:90 -#: templates/web/fixmystreet/report/display.html:84 +#: templates/web/default/report/update-form.html:41 +#: templates/web/fixmystreet/report/update-form.html:38 msgid "This problem has not been fixed" msgstr "Dette problemet har ikkje vorte løyst" @@ -3363,25 +3474,25 @@ msgstr "Dette problemet er under arbeid" msgid "This problem is old and of unknown status." msgstr "Dette problemet er gammalt og med ukjend status." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:83 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 msgid "This report is currently marked as closed." msgstr "Denne rapporten er for tida markert som lukka." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:81 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84 msgid "This report is currently marked as fixed." msgstr "Denne rapporten er for tida markert som fiksa." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:85 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88 msgid "This report is currently marked as open." msgstr "Denne rapporten er for tida markert som open." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:262 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:264 msgid "" "This web page also contains a photo of the problem, provided by the user." msgstr "" "Denne nettsida inneheld òg eit bilete av problemet, sendt inn av brukaren." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1024 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1034 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -3391,7 +3502,7 @@ msgstr "Tidslinje" msgid "Title" msgstr "Tittel" -#: templates/web/default/around/display_location.html:69 +#: templates/web/default/around/_report_banner.html:2 #, fuzzy msgid "" "To <strong>report a problem</strong>, click on the map at the correct " @@ -3416,7 +3527,7 @@ msgid "" msgstr "" "Du finn lokale problem ved å søkja på postnummeret ditt, vegnamn eller stad:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:268 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:270 msgid "To view a map of the precise location of this issue" msgstr "For å sjå eit kart med ei meir presis plassering for dette problemet" @@ -3427,7 +3538,7 @@ msgstr "For å sjå eit kart med ei meir presis plassering for dette problemet" msgid "Total" msgstr "Totalt" -#: perllib/FixMyStreet/App/Controller/Reports.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:42 msgid "Unable to look up areas in MaPit. Please try again later." msgstr "" "Klarte ikkje slå opp område i MaPit. Ver venleg og prøv igjen seinare." @@ -3443,16 +3554,16 @@ msgstr "Ikkje stadfesta" msgid "Unknown" msgstr "*ukjent*" -#: perllib/FixMyStreet/App/Controller/Rss.pm:164 +#: perllib/FixMyStreet/App/Controller/Rss.pm:173 msgid "Unknown alert type" msgstr "Ukjend varsel-type" -#: perllib/FixMyStreet/App/Controller/Report.pm:70 +#: perllib/FixMyStreet/App/Controller/Report.pm:87 msgid "Unknown problem ID" msgstr "Ukjend problem-ID" #: templates/web/bromley/report/display.html:66 -#: templates/web/fixmystreet/report/display.html:65 +#: templates/web/fixmystreet/report/update-form.html:19 #, fuzzy msgid "Update" msgstr "Oppdatering:" @@ -3491,17 +3602,17 @@ msgstr "Ei oppdatering markerte dette problemet som fiksa." msgid "Update reopened problem" msgstr "Ei oppdatering gjenopna problemet" -#: templates/web/default/admin/council_contacts.html:62 +#: templates/web/default/admin/council_contacts.html:68 msgid "Update statuses" msgstr "Oppdater tilstanden" -#: templates/web/default/report/display.html:71 +#: templates/web/default/report/update-form.html:22 msgid "Update:" msgstr "Oppdatering:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:694 -#: perllib/FixMyStreet/App/Controller/Admin.pm:809 -#: perllib/FixMyStreet/App/Controller/Admin.pm:889 +#: perllib/FixMyStreet/App/Controller/Admin.pm:708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:839 +#: perllib/FixMyStreet/App/Controller/Admin.pm:899 msgid "Updated!" msgstr "Oppdatert!" @@ -3524,20 +3635,21 @@ msgstr "Oppdateringar av {{title}}" msgid "Updates to this problem, FixMyStreet" msgstr "Oppdateringar til dette problemet, FiksGataMi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1182 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1191 msgid "User flag removed" msgstr "Brukarflagg fjerna" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1154 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1163 msgid "User flagged" msgstr "Brukar flagga" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 #: templates/web/default/admin/list_flagged.html:30 msgid "Users" msgstr "Brukarar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:309 -#: perllib/FixMyStreet/App/Controller/Admin.pm:339 +#: perllib/FixMyStreet/App/Controller/Admin.pm:315 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 msgid "Values updated" msgstr "Verdi oppdatert" @@ -3546,7 +3658,7 @@ msgstr "Verdi oppdatert" msgid "View report on site" msgstr "Sjå rapport på nettstaden" -#: templates/web/default/reports/council.html:18 +#: templates/web/default/reports/body.html:18 #, fuzzy msgid "View reports by ward" msgstr "Sjå rapport på nettstaden" @@ -3559,20 +3671,19 @@ msgstr "Vis rapporten din" #: templates/web/default/around/display_location.html:33 #: templates/web/emptyhomes/around/display_location.html:0 #: templates/web/emptyhomes/around/display_location.html:16 -#: templates/web/fixmystreet/around/display_location.html:0 -#: templates/web/fixmystreet/around/display_location.html:33 msgid "Viewing a location" msgstr "Ser på ein stad" #: templates/web/bromley/report/display.html:0 #: templates/web/default/report/display.html:0 +#: templates/web/emptyhomes/report/display.html:1 #: templates/web/emptyhomes/report/display.html:2 #: templates/web/fixmystreet/report/display.html:0 msgid "Viewing a problem" msgstr "Ser på eit problem" -#: templates/web/default/reports/council.html:20 -#: templates/web/emptyhomes/reports/council.html:18 +#: templates/web/default/reports/body.html:20 +#: templates/web/emptyhomes/reports/body.html:18 msgid "Wards of this council" msgstr "Bydelar innanfor denne administrasjonen" @@ -3602,20 +3713,21 @@ msgstr "" "endra seg med eiedommen du rapporterte." #: templates/web/bromley/report/display.html:141 -#: templates/web/fixmystreet/report/display.html:153 +#: templates/web/fixmystreet/report/update-form.html:113 #, fuzzy msgid "We never show your email" msgstr "(vi viser aldri e-postadressa di)" #: templates/web/bromley/report/new/fill_in_details_form.html:133 #: templates/web/bromley/report/new/fill_in_details_form.html:179 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:130 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:190 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:144 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:211 +#: templates/web/zurich/report/new/fill_in_details_form.html:114 #, fuzzy msgid "We never show your email address or phone number." msgstr "(vi viser aldri e-postadressa di eller telefonnummeret ditt)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:349 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:351 msgid "" "We realise this problem might be the responsibility of %s; however, we don't " "currently have any contact details for them. If you know of an appropriate " @@ -3625,13 +3737,14 @@ msgstr "" "tida kontaktinformasjon for dei. Viss du veit om ei eigna kontaktadresse, ta " "kontakt med oss." -#: templates/web/default/index.html:34 templates/web/emptyhomes/index.html:59 -#: templates/web/fixmystreet/index.html:45 +#: templates/web/default/index-steps.html:16 +#: templates/web/emptyhomes/index.html:59 msgid "We send it to the council on your behalf" msgstr "Vi sender til administrasjon på dine vegner" #: templates/web/bromley/report/new/fill_in_details_form.html:217 #: templates/web/default/report/new/notes.html:5 +#: templates/web/fixmybarangay/report/new/notes.html:5 msgid "" "We will only use your personal information in accordance with our <a href=\"/" "faq#privacy\">privacy policy.</a>" @@ -3667,8 +3780,8 @@ msgstr "" "Vi ynskjer å få tilbakemelding frå deg om kva du meiner om denne tenesta. " "Berre fyll ut skjemaet, eller send ein e-post <a href='mailto:%s'>%s</a>:" -#: templates/web/default/admin/council_contacts.html:41 -#: templates/web/default/admin/council_edit.html:41 +#: templates/web/default/admin/council_contacts.html:45 +#: templates/web/default/admin/council_edit.html:69 msgid "When edited" msgstr "Når redigert" @@ -3677,7 +3790,7 @@ msgstr "Når redigert" msgid "When sent" msgstr "Når sendt" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:612 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:611 msgid "Whole block of empty flats" msgstr "Heil blokk med tomme leilegheiter" @@ -3693,6 +3806,7 @@ msgstr "" "href=\"%s\">MaPit</a>." #: templates/web/fixmystreet/footer.html:22 +#: templates/web/stevenage/footer.html:22 msgid "" "Would you like better integration with FixMyStreet? <a href=\"http://www." "mysociety.org/for-councils/fixmystreet/\">Find out about FixMyStreet for " @@ -3700,6 +3814,7 @@ msgid "" msgstr "" #: templates/web/fixmystreet/footer.html:18 +#: templates/web/stevenage/footer.html:18 #, fuzzy msgid "" "Would you like to contribute to FixMyStreet? Our code is open source and <a " @@ -3718,6 +3833,7 @@ msgstr "" "å sjekka status?" #: templates/web/default/report/new/notes.html:8 +#: templates/web/fixmybarangay/report/new/notes.html:8 #: templates/web/fixmystreet/report/new/notes.html:7 msgid "" "Writing your message entirely in block capitals makes it hard to read, as " @@ -3730,8 +3846,9 @@ msgstr "" msgid "Year" msgstr "År" -#: templates/web/default/admin/council_contacts.html:48 -#: templates/web/default/admin/council_contacts.html:49 +#: templates/web/default/admin/council_contacts.html:52 +#: templates/web/default/admin/council_contacts.html:53 +#: templates/web/default/admin/council_contacts.html:54 #: templates/web/default/admin/council_edit.html:5 #: templates/web/default/admin/list_updates.html:30 #: templates/web/default/admin/list_updates.html:31 @@ -3751,8 +3868,8 @@ msgstr "Ja" #: templates/web/bromley/report/display.html:155 #: templates/web/bromley/report/new/fill_in_details_form.html:198 -#: templates/web/fixmystreet/report/display.html:133 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:156 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:171 +#: templates/web/fixmystreet/report/update-form.html:87 #, fuzzy msgid "Yes I have a password" msgstr "<strong>Ja</strong>, eg har eit passord:" @@ -3775,7 +3892,7 @@ msgstr "" "Du rapporterer at følgjande oppdatering er støytande, inneheld personleg " "informasjon, eller liknande:" -#: templates/web/emptyhomes/reports/council.html:64 +#: templates/web/emptyhomes/reports/body.html:64 msgid "" "You can <a href=\"%s\">view all reports for the council</a> or <a href=\"/" "reports\">show all councils</a>." @@ -3783,7 +3900,7 @@ msgstr "" "Du kan <a href=\"%s\">sjå alle rapportar for administrasjonen</a> eller <a " "href=\"/reports\">sjå alle administrasjonane</a>." -#: templates/web/emptyhomes/reports/council.html:66 +#: templates/web/emptyhomes/reports/body.html:66 msgid "You can <a href=\"/reports\">show all councils</a>." msgstr "Du kan <a href=\"/reports/\">sjå alle administrasjonar</a>." @@ -3811,7 +3928,8 @@ msgstr "" #: templates/web/default/questionnaire/index.html:92 #: templates/web/default/report/new/fill_in_details_form.html:93 #: templates/web/fixmystreet/questionnaire/index.html:87 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:101 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:99 +#: templates/web/zurich/report/new/fill_in_details_form.html:93 msgid "" "You have already attached a photo to this report, attaching another one will " "replace it." @@ -3820,8 +3938,8 @@ msgstr "" "anna vil byta ut dette." #: templates/web/bromley/report/display.html:106 -#: templates/web/default/report/display.html:106 -#: templates/web/fixmystreet/report/display.html:100 +#: templates/web/default/report/update-form.html:57 +#: templates/web/fixmystreet/report/update-form.html:54 msgid "" "You have already attached a photo to this update, attaching another one will " "replace it." @@ -3830,12 +3948,14 @@ msgstr "" "anna vil byta ut dette." #: templates/web/default/auth/sign_out.html:3 +#: templates/web/fixmybarangay/auth/sign_out.html:3 msgid "You have been signed out" msgstr "Du er allereie logga ut" #: templates/web/bromley/report/new/fill_in_details_form.html:25 #: templates/web/default/report/new/fill_in_details_form.html:7 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:27 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:28 +#: templates/web/zurich/report/new/fill_in_details_form.html:28 #, fuzzy msgid "" "You have located the problem at the point marked with a green pin on the " @@ -3870,8 +3990,8 @@ msgstr "Du har oppretta varselet ditt." msgid "You have successfully deleted your alert." msgstr "Sletting av varselet ditt var vellukka." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:740 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:136 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:743 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:140 msgid "" "You have successfully signed in; please check and confirm your details are " "accurate:" @@ -3905,16 +4025,18 @@ msgstr "Rapportane dine" #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 #: templates/web/fixmystreet/contact/index.html:72 -#: templates/web/fixmystreet/report/display.html:34 -#: templates/web/fixmystreet/report/display.html:36 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:142 +#: templates/web/fixmystreet/report/display.html:53 +#: templates/web/fixmystreet/report/display.html:55 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:115 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:157 +#: templates/web/zurich/report/new/fill_in_details_form.html:106 #, fuzzy msgid "Your email" msgstr "E-posten din" #: templates/web/bromley/report/display.html:130 #: templates/web/fixmystreet/auth/general.html:26 -#: templates/web/fixmystreet/report/display.html:124 +#: templates/web/fixmystreet/report/update-form.html:78 #, fuzzy msgid "Your email address" msgstr "e-postadressa di:" @@ -3924,8 +4046,9 @@ msgid "Your email address:" msgstr "e-postadressa di:" #: templates/web/default/alert/_list.html:92 -#: templates/web/default/report/display.html:128 #: templates/web/default/report/new/fill_in_details_form.html:124 +#: templates/web/default/report/update-form.html:79 +#: templates/web/fixmybarangay/alert/_list.html:37 msgid "Your email:" msgstr "E-posten din" @@ -3952,27 +4075,28 @@ msgstr "" msgid "Your last name" msgstr "Namnet ditt:" -#: templates/web/fixmystreet/auth/general.html:53 +#: templates/web/fixmystreet/auth/general.html:57 #: templates/web/fixmystreet/contact/index.html:65 -#: templates/web/fixmystreet/report/display.html:181 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:121 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:181 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:124 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:202 +#: templates/web/fixmystreet/report/update-form.html:138 +#: templates/web/zurich/report/new/fill_in_details_form.html:122 #, fuzzy msgid "Your name" msgstr "Namnet ditt:" #: templates/web/default/auth/general.html:59 #: templates/web/default/contact/index.html:68 -#: templates/web/default/report/display.html:202 #: templates/web/default/report/new/fill_in_details_form.html:203 +#: templates/web/default/report/update-form.html:149 msgid "Your name:" msgstr "Namnet ditt:" #: templates/web/bromley/report/display.html:160 #: templates/web/bromley/report/new/fill_in_details_form.html:203 -#: templates/web/fixmystreet/auth/general.html:37 -#: templates/web/fixmystreet/report/display.html:138 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:161 +#: templates/web/fixmystreet/auth/general.html:41 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:176 +#: templates/web/fixmystreet/report/update-form.html:92 #, fuzzy msgid "Your password" msgstr "Rapportane dine" @@ -3983,8 +4107,9 @@ msgstr "Passordet ditt har vorte endra" #: templates/web/bromley/report/new/fill_in_details_form.html:137 #: templates/web/bromley/report/new/fill_in_details_form.html:184 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:134 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:195 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:149 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:216 +#: templates/web/zurich/report/new/fill_in_details_form.html:125 msgid "Your phone number" msgstr "" @@ -3998,11 +4123,11 @@ msgstr "Oppdateringane dine" #: templates/web/fiksgatami/footer.html:6 #: templates/web/fiksgatami/nn/footer.html:6 #: templates/web/fixmystreet/footer.html:47 -#: templates/web/reading/footer.html:7 +#: templates/web/reading/footer.html:7 templates/web/stevenage/footer.html:41 msgid "Your reports" msgstr "Oppdateringane dine" -#: templates/web/default/my/my.html:45 templates/web/fixmystreet/my/my.html:45 +#: templates/web/default/my/my.html:45 templates/web/fixmystreet/my/my.html:49 msgid "Your updates" msgstr "Oppdateringane dine" @@ -4014,19 +4139,23 @@ msgstr "E-posten din:" msgid "by %s" msgstr "av %s" -#: templates/web/default/reports/council.html:12 -#: templates/web/default/reports/council.html:13 -#: templates/web/emptyhomes/reports/council.html:6 -#: templates/web/emptyhomes/reports/council.html:7 +#: templates/web/default/reports/body.html:12 +#: templates/web/default/reports/body.html:13 +#: templates/web/emptyhomes/reports/body.html:6 +#: templates/web/emptyhomes/reports/body.html:7 msgid "council" msgstr "administrasjon" +#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +msgid "council ref: %s" +msgstr "" + #: templates/web/default/admin/report_edit.html:15 msgid "didn't use map" msgstr "brukte ikkje kart" #: templates/web/default/alert/index.html:33 -#: templates/web/fixmystreet/around/postcode_form.html:17 +#: templates/web/fixmystreet/around/postcode_form.html:20 msgid "e.g. ‘%s’ or ‘%s’" msgstr "" @@ -4034,7 +4163,7 @@ msgstr "" msgid "from %d different users" msgstr "frå %d ulike brukarar" -#: perllib/Utils.pm:289 +#: perllib/Utils.pm:267 msgid "less than a minute" msgstr "mindre enn eitt minutt" @@ -4046,17 +4175,22 @@ msgstr "markert som %s" msgid "marked as fixed" msgstr "markert som løyst" -#: perllib/FixMyStreet/App/Controller/Admin.pm:112 +#: perllib/FixMyStreet/App/Controller/Admin.pm:113 #: templates/web/default/admin/questionnaire.html:15 #: templates/web/default/admin/questionnaire.html:16 msgid "n/a" msgstr "i/t" #: templates/web/default/alert/_list.html:87 +#: templates/web/fixmybarangay/alert/_list.html:32 #: templates/web/fixmystreet/alert/_list.html:85 msgid "or" msgstr "eller" +#: templates/web/default/js/validation_strings.html:21 +msgid "or locate me automatically" +msgstr "" + #: templates/web/default/admin/report_edit.html:15 msgid "originally entered" msgstr "søkte etter" @@ -4071,9 +4205,9 @@ msgstr "opna på nytt" #: templates/web/barnet/header.html:71 templates/web/bromley/header.html:100 #: templates/web/bromley/header.html:65 -#: templates/web/fixmybarangay/header.html.orig:43 -#: templates/web/fixmystreet/header.html:48 -#: templates/web/zurich/header.html:48 +#: templates/web/fixmybarangay/header.html:65 +#: templates/web/fixmystreet/header.html:50 +#: templates/web/stevenage/header.html:98 templates/web/zurich/header.html:48 #, fuzzy msgid "sign out" msgstr "Logg ut" @@ -4084,22 +4218,20 @@ msgstr "Logg ut" #: templates/web/default/report/new/fill_in_details_form.html:14 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:6 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:9 +#: templates/web/zurich/report/new/fill_in_details_form.html:6 +#: templates/web/zurich/report/new/fill_in_details_form.html:9 msgid "the local council" msgstr "den lokale administrasjonen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:541 -msgid "the map was not used so pin location may be inaccurate" -msgstr "karta vart ikkje brukt, så nåleposisjon kan vera unøyaktig" - -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 -msgid "their ref: %s" +#: templates/web/default/report/_main.html:6 +msgid "there is no pin shown as the user did not use the map" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:330 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:332 msgid "this type of local problem" msgstr "denne typen lokalt problem" -#: perllib/Utils.pm:263 +#: perllib/Utils.pm:241 msgid "today" msgstr "i dag" @@ -4115,10 +4247,10 @@ msgstr "brukaren er frå same administrasjon som problemet – %d" msgid "user is problem owner" msgstr "brukaren er eigaren av problemet" -#: templates/web/default/reports/council.html:0 -#: templates/web/default/reports/council.html:9 -#: templates/web/emptyhomes/reports/council.html:0 -#: templates/web/emptyhomes/reports/council.html:3 +#: templates/web/default/reports/body.html:0 +#: templates/web/default/reports/body.html:9 +#: templates/web/emptyhomes/reports/body.html:0 +#: templates/web/emptyhomes/reports/body.html:3 msgid "ward" msgstr "bydel" @@ -4152,6 +4284,34 @@ msgstr "vil problemet ditt ikkje publiserast" msgid "your update will not be posted" msgstr "oppdateringa di vil ikkje publiserast" +#: templates/web/emptyhomes/front/stats.html:17 +#, perl-format +msgid "<big>%s</big> report recently" +msgid_plural "<big>%s</big> reports recently" +msgstr[0] "<big>%s</big> rapport nyleg" +msgstr[1] "<big>%s</big> rapportar nyleg" + +#: perllib/Utils.pm:286 +#, fuzzy, perl-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d time" +msgstr[1] "%d time" + +#: perllib/Utils.pm:288 +#, fuzzy, perl-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d minutt" +msgstr[1] "%d minutt" + +#: templates/web/default/front/stats.html:29 +#, perl-format +msgid "<big>%s</big> update on reports" +msgid_plural "<big>%s</big> updates on reports" +msgstr[0] "<big>%s</big> rapportoppdatering" +msgstr[1] "<big>%s</big> rapportoppdateringar" + #: templates/web/emptyhomes/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." @@ -4162,12 +4322,12 @@ msgstr[0] "" msgstr[1] "" "Vi har enno ikkje detaljar for administrasjonane som dekkjer denne staden." -#: templates/web/emptyhomes/front/stats.html:17 -#, perl-format -msgid "<big>%s</big> report recently" -msgid_plural "<big>%s</big> reports recently" -msgstr[0] "<big>%s</big> rapport nyleg" -msgstr[1] "<big>%s</big> rapportar nyleg" +#: perllib/Utils.pm:282 +#, fuzzy, perl-format +msgid "%d week" +msgid_plural "%d weeks" +msgstr[0] "%d veke" +msgstr[1] "%d veke" #: templates/web/emptyhomes/front/stats.html:12 #, perl-format @@ -4198,12 +4358,49 @@ msgstr[1] "" "Vi har enno <strong>ikkje</strong> detaljane for dei andre administrasjonane " "som dekkjer denne staden." -#: templates/web/default/front/stats.html:29 -#, perl-format -msgid "<big>%s</big> update on reports" -msgid_plural "<big>%s</big> updates on reports" -msgstr[0] "<big>%s</big> rapportoppdatering" -msgstr[1] "<big>%s</big> rapportoppdateringar" +#: perllib/Utils.pm:284 +#, fuzzy, perl-format +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "%d dag" +msgstr[1] "%d dag" + +#~ msgid "FixMyStreet administration" +#~ msgstr "Fiksgatami-administrasjon" + +#~ msgid "List Flagged" +#~ msgstr "Vis flagga" + +#~ msgid "Search Abuse" +#~ msgstr "Søk etter misbruk" + +#~ msgid "Search Abuse Table" +#~ msgstr "Søk i misbruktabell" + +#~ msgid "" +#~ "Please do not be abusive — abusing your council devalues the " +#~ "service for all users." +#~ msgstr "" +#~ "Ikkje ver ufin — å kjefta på administrasjonen din skader verdet av " +#~ "tenesta for alle brukarane." + +#~ msgid "%d days" +#~ msgstr "%d dagar" + +#~ msgid "%d hours" +#~ msgstr "%d timar" + +#~ msgid "%d minutes" +#~ msgstr "%d minutt" + +#~ msgid "%d weeks" +#~ msgstr "%d veker" + +#~ msgid "All" +#~ msgstr "Alle" + +#~ msgid "the map was not used so pin location may be inaccurate" +#~ msgstr "karta vart ikkje brukt, så nåleposisjon kan vera unøyaktig" #, fuzzy #~ msgid "FixMyStreet for Councils" diff --git a/perllib/FixMyStreet/App/Controller/Location.pm b/perllib/FixMyStreet/App/Controller/Location.pm index e8bf2cd1c..fd3fadd9f 100644 --- a/perllib/FixMyStreet/App/Controller/Location.pm +++ b/perllib/FixMyStreet/App/Controller/Location.pm @@ -5,6 +5,7 @@ use namespace::autoclean; BEGIN {extends 'Catalyst::Controller'; } use Encode; +use FixMyStreet::Geocode; =head1 NAME diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm index dedd447ee..7759bb938 100644 --- a/perllib/FixMyStreet/App/Controller/Report/New.pm +++ b/perllib/FixMyStreet/App/Controller/Report/New.pm @@ -4,7 +4,6 @@ use Moose; use namespace::autoclean; BEGIN { extends 'Catalyst::Controller'; } -use FixMyStreet::Geocode; use Encode; use List::MoreUtils qw(uniq); use POSIX 'strcoll'; @@ -928,6 +927,13 @@ sub check_for_errors : Private { %{ $c->stash->{report}->check_for_errors }, ); + # Zurich, we don't care about title or name + # There is no title, and name is optional + if ( $c->cobrand->moniker eq 'zurich' ) { + delete $field_errors{title}; + delete $field_errors{name}; + } + # FIXME: need to check for required bromley fields here # if they're got the login details wrong when signing in then diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm index c33135673..a4c4f4ffc 100644 --- a/perllib/FixMyStreet/Cobrand/Bromley.pm +++ b/perllib/FixMyStreet/Cobrand/Bromley.pm @@ -29,7 +29,7 @@ sub disambiguate_location { my $town = 'Bromley'; # Bing turns High St Bromley into Bromley High St which is in # Bromley by Bow. - if ( $string =~ /high\+st/i ) { + if ( $string =~ /high\s+st/i ) { $town .= ', BR1'; } return { diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm index cc8f6c526..86ea693b7 100644 --- a/perllib/FixMyStreet/Cobrand/Default.pm +++ b/perllib/FixMyStreet/Cobrand/Default.pm @@ -4,6 +4,7 @@ use base 'FixMyStreet::Cobrand::Base'; use strict; use warnings; use FixMyStreet; +use FixMyStreet::Geocode::Bing; use Encode; use URI; use Digest::MD5 qw(md5_hex); diff --git a/perllib/FixMyStreet/Cobrand/Zurich.pm b/perllib/FixMyStreet/Cobrand/Zurich.pm new file mode 100644 index 000000000..e5d646c8b --- /dev/null +++ b/perllib/FixMyStreet/Cobrand/Zurich.pm @@ -0,0 +1,16 @@ +package FixMyStreet::Cobrand::Zurich; +use base 'FixMyStreet::Cobrand::Default'; + +use strict; +use warnings; + +sub enter_postcode_text { + my ( $self ) = @_; + return _('Enter a Zürich street name'); +} + +sub example_places { + return [ 'Langstrasse', 'Basteiplatz' ]; +} + +1; diff --git a/perllib/FixMyStreet/Geocode.pm b/perllib/FixMyStreet/Geocode.pm index f92e9cc9a..6cfd960ed 100644 --- a/perllib/FixMyStreet/Geocode.pm +++ b/perllib/FixMyStreet/Geocode.pm @@ -13,6 +13,7 @@ use URI::Escape; use FixMyStreet::Geocode::Bing; use FixMyStreet::Geocode::Google; use FixMyStreet::Geocode::OSM; +use FixMyStreet::Geocode::Zurich; # lookup STRING CONTEXT # Given a user-inputted string, try and convert it into co-ordinates using either @@ -33,18 +34,27 @@ sub lookup { # Canonicalises, and then passes to some external API to look stuff up. sub string { my ($s, $c) = @_; + + my $service = $c->config->{GEOCODER}; + $service = $service->{type} if ref $service; + $service = 'OSM' unless $service =~ /^(Bing|Google|OSM|Zurich)$/; + $service = 'OSM' if $service eq 'Bing' && !FixMyStreet->config('BING_MAPS_API_KEY'); + $service = "FixMyStreet::Geocode::${service}::string"; + + no strict 'refs'; + return &$service($s, $c); +} + +# escape STRING CONTEXT +# Escapes string for putting in URL geocoding call +sub escape { + my ($s, $c) = @_; $s = lc($s); $s =~ s/[^-&\w ']/ /g; $s =~ s/\s+/ /g; $s = URI::Escape::uri_escape_utf8($s); $s =~ s/%20/+/g; - my $params = $c->cobrand->disambiguate_location($s); - return FixMyStreet::Geocode::Bing::string($s, $c, $params) - if FixMyStreet->config('BING_MAPS_API_KEY'); - # Fall back to Google API, which allow access with and without a key - return FixMyStreet::Geocode::Google::string($s, $c, $params) - if FixMyStreet->config('GOOGLE_MAPS_API_KEY'); - return FixMyStreet::Geocode::OSM::string($s, $c, $params); + return $s; } 1; diff --git a/perllib/FixMyStreet/Geocode/Bing.pm b/perllib/FixMyStreet/Geocode/Bing.pm index 18e6b56ce..85eef3d0f 100644 --- a/perllib/FixMyStreet/Geocode/Bing.pm +++ b/perllib/FixMyStreet/Geocode/Bing.pm @@ -15,14 +15,21 @@ use File::Path (); use LWP::Simple; use Digest::MD5 qw(md5_hex); +use mySociety::Locale; + # string STRING CONTEXT # Looks up on Bing Maps API, and caches, a user-inputted location. # Returns array of (LAT, LON, ERROR), where ERROR is either undef, a string, or # an array of matches if there are more than one. The information in the query # may be used to disambiguate the location in cobranded versions of the site. sub string { - my ( $s, $c, $params ) = @_; + my ( $s, $c ) = @_; + + my $params = $c->cobrand->disambiguate_location($s); + + $s = FixMyStreet::Geocode::escape($s); $s .= '+' . $params->{town} if $params->{town} and $s !~ /$params->{town}/i; + my $url = "http://dev.virtualearth.net/REST/v1/Locations?q=$s"; $url .= '&userMapView=' . join(',', @{$params->{bounds}}) if $params->{bounds}; diff --git a/perllib/FixMyStreet/Geocode/Google.pm b/perllib/FixMyStreet/Geocode/Google.pm index db3a8ae91..fd65b89b1 100644 --- a/perllib/FixMyStreet/Geocode/Google.pm +++ b/perllib/FixMyStreet/Geocode/Google.pm @@ -14,6 +14,7 @@ use File::Slurp; use File::Path (); use LWP::Simple; use Digest::MD5 qw(md5_hex); +use mySociety::Locale; # string STRING CONTEXT # Looks up on Google Maps API, and caches, a user-inputted location. @@ -21,7 +22,11 @@ use Digest::MD5 qw(md5_hex); # an array of matches if there are more than one. The information in the query # may be used to disambiguate the location in cobranded versions of the site. sub string { - my ( $s, $c, $params ) = @_; + my ( $s, $c ) = @_; + + my $params = $c->cobrand->disambiguate_location($s); + + $s = FixMyStreet::Geocode::escape($s); my $url = 'http://maps.google.com/maps/geo?q=' . $s; $url .= '&ll=' . $params->{centre} if $params->{centre}; diff --git a/perllib/FixMyStreet/Geocode/OSM.pm b/perllib/FixMyStreet/Geocode/OSM.pm index d96338c16..fd14b0acc 100644 --- a/perllib/FixMyStreet/Geocode/OSM.pm +++ b/perllib/FixMyStreet/Geocode/OSM.pm @@ -29,8 +29,13 @@ my $nominatimbase = "http://nominatim.openstreetmap.org/"; # an array of matches if there are more than one. The information in the query # may be used to disambiguate the location in cobranded versions of the site. sub string { - my ( $s, $c, $params ) = @_; + my ( $s, $c ) = @_; + + my $params = $c->cobrand->disambiguate_location($s); + + $s = FixMyStreet::Geocode::escape($s); $s .= '+' . $params->{town} if $params->{town} and $s !~ /$params->{town}/i; + my $url = "${nominatimbase}search?"; my %query_params = ( q => $s, diff --git a/perllib/FixMyStreet/Geocode/Zurich.pm b/perllib/FixMyStreet/Geocode/Zurich.pm new file mode 100644 index 000000000..5aaca2c8e --- /dev/null +++ b/perllib/FixMyStreet/Geocode/Zurich.pm @@ -0,0 +1,107 @@ +#!/usr/bin/perl +# +# FixMyStreet::Geocode::Zurich +# Geocoding with Zurich web service. +# +# Thanks to http://msdn.microsoft.com/en-us/library/ms995764.aspx +# and http://noisemore.wordpress.com/2009/03/19/perl-soaplite-wsse-web-services-security-soapheader/ +# for SOAP::Lite pointers +# +# Copyright (c) 2012 UK Citizens Online Democracy. All rights reserved. +# Email: matthew@mysociety.org; WWW: http://www.mysociety.org/ + +package FixMyStreet::Geocode::Zurich; + +use strict; +use Digest::MD5 qw(md5_hex); +use File::Path (); +use Geo::Coordinates::CH1903; +use SOAP::Lite; +use Storable; +use mySociety::Locale; + +my ($soap, $method, $security); + +sub setup_soap { + return if $soap; + + # Variables for the SOAP web service + my $geocoder = FixMyStreet->config('GEOCODER'); + my $url = $geocoder->{url}; + my $username = $geocoder->{username}; + my $password = $geocoder->{password}; + my $attr = 'http://ch/geoz/fixmyzuerich/service'; + my $action = "$attr/IFixMyZuerich/"; + + # Set up the SOAP handler + $security = SOAP::Header->name("Security")->attr({ + 'mustUnderstand' => 'true', + 'xmlns' => 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd' + })->value( + \SOAP::Header->name( + "UsernameToken" => \SOAP::Header->value( + SOAP::Header->name('Username', $username), + SOAP::Header->name('Password', $password) + ) + ) + ); + $soap = SOAP::Lite->on_action( sub { $action . $_[1]; } )->proxy($url); + $method = SOAP::Data->name('getLocation')->attr({ xmlns => $attr }); +} + +# string STRING CONTEXT +# Looks up on Zurich web service a user-inputted location. +# Returns array of (LAT, LON, ERROR), where ERROR is either undef, a string, or +# an array of matches if there are more than one. The information in the query +# may be used to disambiguate the location in cobranded versions of the site. +sub string { + my ( $s, $c ) = @_; + + setup_soap(); + + my $cache_dir = FixMyStreet->config('GEO_CACHE') . 'zurich/'; + my $cache_file = $cache_dir . md5_hex($s); + my $result; + if (-s $cache_file) { + $result = retrieve($cache_file); + } else { + my $search = SOAP::Data->name('search' => $s)->type(''); + my $count = SOAP::Data->name('count' => 10)->type(''); + eval { + $result = $soap->call($method, $security, $search, $count); + }; + if ($@) { + return { error => 'The geocoder appears to be down.' }; + } + $result = $result->result; + File::Path::mkpath($cache_dir); + store $result, $cache_file if $result; + } + + if (!$result || !$result->{Location}) { + return { error => _('Sorry, we could not parse that location. Please try again.') }; + } + + my $results = $result->{Location}; + $results = [ $results ] unless ref $results eq 'ARRAY'; + + my ( $error, @valid_locations, $latitude, $longitude ); + foreach (@$results) { + ($latitude, $longitude) = Geo::Coordinates::CH1903::to_latlon($_->{easting}, $_->{northing}); + mySociety::Locale::in_gb_locale { + push (@$error, { + address => $_->{text}, + latitude => sprintf('%0.6f', $latitude), + longitude => sprintf('%0.6f', $longitude) + }); + }; + push (@valid_locations, $_); + last if lc($_->{text}) eq lc($s); + } + + return { latitude => $latitude, longitude => $longitude } if scalar @valid_locations == 1; + return { error => $error }; +} + +1; + diff --git a/perllib/FixMyStreet/Map.pm b/perllib/FixMyStreet/Map.pm index 587c63d25..a1876e150 100644 --- a/perllib/FixMyStreet/Map.pm +++ b/perllib/FixMyStreet/Map.pm @@ -114,7 +114,26 @@ sub _map_features { } sub map_pins { - return $map_class->map_pins(@_); + my ($c, $interval) = @_; + + my $bbox = $c->req->param('bbox'); + my ( $min_lon, $min_lat, $max_lon, $max_lat ) = split /,/, $bbox; + + my ( $around_map, $around_map_list, $nearby, $dist ) = + FixMyStreet::Map::map_features_bounds( $c, $min_lon, $min_lat, $max_lon, $max_lat, $interval ); + + # create a list of all the pins + my @pins = map { + # Here we might have a DB::Problem or a DB::Nearby, we always want the problem. + my $p = (ref $_ eq 'FixMyStreet::App::Model::DB::Nearby') ? $_->problem : $_; + my $colour = $c->cobrand->pin_colour( $p, 'around' ); + [ $p->latitude, $p->longitude, + $colour, + $p->id, $p->title + ] + } @$around_map, @$nearby; + + return (\@pins, $around_map_list, $nearby, $dist); } sub click_to_wgs84 { diff --git a/perllib/FixMyStreet/Map/OSM.pm b/perllib/FixMyStreet/Map/OSM.pm index 6b3bebba2..d8abc9dd6 100644 --- a/perllib/FixMyStreet/Map/OSM.pm +++ b/perllib/FixMyStreet/Map/OSM.pm @@ -94,29 +94,6 @@ sub display_map { }; } -sub map_pins { - my ($self, $c, $interval) = @_; - - my $bbox = $c->req->param('bbox'); - my ( $min_lon, $min_lat, $max_lon, $max_lat ) = split /,/, $bbox; - - my ( $around_map, $around_map_list, $nearby, $dist ) = - FixMyStreet::Map::map_features_bounds( $c, $min_lon, $min_lat, $max_lon, $max_lat, $interval ); - - # create a list of all the pins - my @pins = map { - # Here we might have a DB::Problem or a DB::Nearby, we always want the problem. - my $p = (ref $_ eq 'FixMyStreet::App::Model::DB::Nearby') ? $_->problem : $_; - my $colour = $c->cobrand->pin_colour( $p, 'around' ); - [ $p->latitude, $p->longitude, - $colour, - $p->id, $p->title - ] - } @$around_map, @$nearby; - - return (\@pins, $around_map_list, $nearby, $dist); -} - sub compass { my ( $x, $y, $z ) = @_; return { diff --git a/perllib/FixMyStreet/Map/Zurich.pm b/perllib/FixMyStreet/Map/Zurich.pm new file mode 100644 index 000000000..d2f7a35af --- /dev/null +++ b/perllib/FixMyStreet/Map/Zurich.pm @@ -0,0 +1,177 @@ +#!/usr/bin/perl +# +# FixMyStreet:Map::Zurich +# Zurich have their own tileserver. +# +# Copyright (c) 2012 UK Citizens Online Democracy. All rights reserved. +# Email: steve@mysociety.org; WWW: http://www.mysociety.org/ + +package FixMyStreet::Map::Zurich; + +use strict; +use Geo::Coordinates::CH1903; +use Math::Trig; +use Utils; + +use constant ZOOM_LEVELS => 10; +use constant DEFAULT_ZOOM => 7; +use constant MIN_ZOOM_LEVEL => 0; + +sub map_tiles { + my ( $self, %params ) = @_; + my ( $col, $row, $z ) = ( $params{x_tile}, $params{y_tile}, $params{matrix_id} ); + my $tile_url = $self->base_tile_url(); + return [ + "$tile_url/$z/" . ($row - 1) . "/" . ($col - 1) . ".jpg", + "$tile_url/$z/" . ($row - 1) . "/$col.jpg", + "$tile_url/$z/$row/" . ($col - 1) . ".jpg", + "$tile_url/$z/$row/$col.jpg", + ]; +} + +sub base_tile_url { + return 'http://www.wmts.stadt-zuerich.ch/Luftbild/MapServer/WMTS/tile/1.0.0/Luftbild/default/nativeTileMatrixSet'; +} + +sub copyright { + return '© Stadt Zürich'; +} + +# display_map C PARAMS +# PARAMS include: +# latitude, longitude for the centre point of the map +# CLICKABLE is set if the map is clickable +# PINS is array of pins to show, location and colour +sub display_map { + my ($self, $c, %params) = @_; + + my $numZoomLevels = ZOOM_LEVELS; + my $zoomOffset = MIN_ZOOM_LEVEL; +# if ($params{any_zoom}) { +# $numZoomLevels = 10; +# $zoomOffset = 0; +# } + + # TODO Adjust zoom level dependent upon population density + my $default_zoom = DEFAULT_ZOOM; + + # Map centre may be overridden in the query string + $params{latitude} = Utils::truncate_coordinate($c->req->params->{lat} + 0) + if defined $c->req->params->{lat}; + $params{longitude} = Utils::truncate_coordinate($c->req->params->{lon} + 0) + if defined $c->req->params->{lon}; + + my $zoom = defined $c->req->params->{zoom} ? $c->req->params->{zoom} + 0 : $default_zoom; + $zoom = $numZoomLevels - 1 if $zoom >= $numZoomLevels; + $zoom = 0 if $zoom < 0; + $params{zoom_act} = $zoomOffset + $zoom; + + ($params{x_tile}, $params{y_tile}, $params{matrix_id}) = latlon_to_tile_with_adjust($params{latitude}, $params{longitude}, $params{zoom_act}); + + foreach my $pin (@{$params{pins}}) { + ($pin->{px}, $pin->{py}) = latlon_to_px($pin->{latitude}, $pin->{longitude}, $params{x_tile}, $params{y_tile}, $params{zoom_act}); + } + + $c->stash->{map} = { + %params, + type => 'zurich', + map_type => 'OpenLayers.Layer.WMTS', + tiles => $self->map_tiles( %params ), + copyright => $self->copyright(), + zoom => $zoom, + zoomOffset => $zoomOffset, + numZoomLevels => $numZoomLevels, + }; +} + +# Given a lat/lon, convert it to Zurch tile co-ordinates (precise). +sub latlon_to_tile($$$) { + my ($lat, $lon, $zoom) = @_; + + my ($x, $y) = Geo::Coordinates::CH1903::from_latlon($lat, $lon); + + my $matrix_id = $zoom - 1; + $matrix_id = 0 if $matrix_id < 0; + + my @scales = ( '250000', '125000', '64000', '32000', '16000', '8000', '4000', '2000', '1000', '500' ); + my $tileOrigin = { lat => 30814423, lon => -29386322 }; + my $tileSize = 256; + my $res = $scales[$zoom] / (39.3701 * 96); # OpenLayers.INCHES_PER_UNIT[units] * OpenLayers.DOTS_PER_INCH + + my $fx = ( $x - $tileOrigin->{lon} ) / ($res * $tileSize); + my $fy = ( $tileOrigin->{lat} - $y ) / ($res * $tileSize); + + return ( $fx, $fy, $matrix_id ); +} + +# Given a lat/lon, convert it to OSM tile co-ordinates (nearest actual tile, +# adjusted so the point will be near the centre of a 2x2 tiled map). +sub latlon_to_tile_with_adjust($$$) { + my ($lat, $lon, $zoom) = @_; + my ($x_tile, $y_tile, $matrix_id) = latlon_to_tile($lat, $lon, $zoom); + + # Try and have point near centre of map + if ($x_tile - int($x_tile) > 0.5) { + $x_tile += 1; + } + if ($y_tile - int($y_tile) > 0.5) { + $y_tile += 1; + } + + return ( int($x_tile), int($y_tile), $matrix_id ); +} + +sub tile_to_latlon { + my ($fx, $fy, $zoom) = @_; + + my @scales = ( '250000', '125000', '64000', '32000', '16000', '8000', '4000', '2000', '1000', '500' ); + my $tileOrigin = { lat => 30814423, lon => -29386322 }; + my $tileSize = 256; + my $res = $scales[$zoom] / (39.3701 * 96); # OpenLayers.INCHES_PER_UNIT[units] * OpenLayers.DOTS_PER_INCH + + my $x = $fx * $res * $tileSize + $tileOrigin->{lon}; + my $y = $tileOrigin->{lat} - $fy * $res * $tileSize; + + my ($lat, $lon) = Geo::Coordinates::CH1903::to_latlon($x, $y); + + return ( $lat, $lon ); +} + +# Given a lat/lon, convert it to pixel co-ordinates from the top left of the map +sub latlon_to_px($$$$$) { + my ($lat, $lon, $x_tile, $y_tile, $zoom) = @_; + my ($pin_x_tile, $pin_y_tile) = latlon_to_tile($lat, $lon, $zoom); + my $pin_x = tile_to_px($pin_x_tile, $x_tile); + my $pin_y = tile_to_px($pin_y_tile, $y_tile); + return ($pin_x, $pin_y); +} + +# Convert tile co-ordinates to pixel co-ordinates from top left of map +# C is centre tile reference of displayed map +sub tile_to_px { + my ($p, $c) = @_; + $p = 256 * ($p - $c + 1); + $p = int($p + .5 * ($p <=> 0)); + return $p; +} + +sub click_to_tile { + my ($pin_tile, $pin) = @_; + $pin -= 256 while $pin > 256; + $pin += 256 while $pin < 0; + return $pin_tile + $pin / 256; +} + +# Given some click co-ords (the tile they were on, and where in the +# tile they were), convert to WGS84 and return. +# XXX Note use of MIN_ZOOM_LEVEL here. (Copied from OSM, needed here?) +sub click_to_wgs84 { + my ($self, $c, $pin_tile_x, $pin_x, $pin_tile_y, $pin_y) = @_; + my $tile_x = click_to_tile($pin_tile_x, $pin_x); + my $tile_y = click_to_tile($pin_tile_y, $pin_y); + my $zoom = MIN_ZOOM_LEVEL + (defined $c->req->params->{zoom} ? $c->req->params->{zoom} : DEFAULT_ZOOM); + my ($lat, $lon) = tile_to_latlon($tile_x, $tile_y, $zoom); + return ( $lat, $lon ); +} + +1; diff --git a/perllib/Geo/Coordinates/CH1903.pm b/perllib/Geo/Coordinates/CH1903.pm new file mode 100644 index 000000000..612182152 --- /dev/null +++ b/perllib/Geo/Coordinates/CH1903.pm @@ -0,0 +1,105 @@ +#!/usr/bin/perl +# +# Geo::Coordinates::CH1903 +# Conversion between WGS84 and Swiss CH1903. +# +# Copyright (c) 2012 UK Citizens Online Democracy. This module is free +# software; you can redistribute it and/or modify it under the same terms as +# Perl itself. +# +# WWW: http://www.mysociety.org/ + +package Geo::Coordinates::CH1903; + +$Geo::Coordinates::CH1903::VERSION = '1.00'; + +use strict; + +=head1 NAME + +Geo::Coordinates::CH1903 + +=head1 VERSION + +1.00 + +=head1 SYNOPSIS + + use Geo::Coordinates::CH1903; + + my ($lat, $lon) = ...; + my ($e, $n) = Geo::Coordinates::CH1903::from_latlon($lat, $lon); + my ($lat, $lon) = Geo::Coordinates::CH1903::to_latlon($e, $n); + +=head1 FUNCTIONS + +=over 4 + +=cut + +sub from_latlon($$) { + my ($lat, $lon) = @_; + + $lat *= 3600; + $lon *= 3600; + + my $lat_aux = ($lat - 169028.66) / 10000; + my $lon_aux = ($lon - 26782.5) / 10000; + + my $x = 600072.37 + + (211455.93 * $lon_aux) + - (10938.51 * $lon_aux * $lat_aux) + - (0.36 * $lon_aux * $lat_aux**2) + - (44.54 * $lon_aux**3); + + my $y = 200147.07 + + (308807.95 * $lat_aux) + + (3745.25 * $lon_aux**2) + + (76.63 * $lat_aux**2) + - (194.56 * $lon_aux**2 * $lat_aux) + + (119.79 * $lat_aux**3); + + return ($x, $y); +} + +sub to_latlon($$) { + my ($x, $y) = @_; + + my $x_aux = ($x - 600000) / 1000000; + my $y_aux = ($y - 200000) / 1000000; + + my $lat = 16.9023892 + + (3.238272 * $y_aux) + - (0.270978 * $x_aux**2) + - (0.002528 * $y_aux**2) + - (0.0447 * $x_aux**2 * $y_aux) + - (0.0140 * $y_aux**3); + + my $lon = 2.6779094 + + (4.728982 * $x_aux) + + (0.791484 * $x_aux * $y_aux) + + (0.1306 * $x_aux * $y_aux**2) + - (0.0436 * $x_aux**3); + + $lat = $lat * 100 / 36; + $lon = $lon * 100 / 36; + + return ($lat, $lon); +} + +=head1 AUTHOR AND COPYRIGHT + +Maths courtesy of the Swiss Federal Office of Topography: +http://www.swisstopo.admin.ch/internet/swisstopo/en/home/products/software/products/skripts.html + +Written by Matthew Somerville + +Copyright (c) UK Citizens Online Democracy. + +This module is free software; you can redistribute it and/or modify it +under the same terms as Perl itself. + +=cut + +1; + diff --git a/perllib/PoChange.pm b/perllib/PoChange.pm index 06b78fa3f..f26161889 100644 --- a/perllib/PoChange.pm +++ b/perllib/PoChange.pm @@ -41,7 +41,6 @@ sub fixmystreet_to_reportemptyhomes($) { $s =~ s/We send it to the council on your behalf/The details will be sent directly to the right person in the local council for them to take action/; $s =~ s/To find out what local alerts we have for you/To find out what local alerts we have in your area, council or ward/; $s =~ s/Local alerts/Get local reports/; - $s =~ s/All reports/Reports/; $s =~ s/Report an empty property/Report a property/; $s =~ s/Help/FAQs/; diff --git a/templates/email/zurich/alert-moderation-overdue.txt b/templates/email/zurich/alert-moderation-overdue.txt new file mode 100644 index 000000000..85906b9cb --- /dev/null +++ b/templates/email/zurich/alert-moderation-overdue.txt @@ -0,0 +1,10 @@ +Subject: eskalierte Meldungen auf FixMyZürich
+
+
+ +Die folgenden Meldungen auf FixMyZürich sind älter als einen Tag und müssen dringend bearbeitet werden:
+<?=$values['data']?>
+
+Um diese Meldungen zu moderieren, klicken Sie auf folgende URL:
+ +<?=$values['admin_url']?>
\ No newline at end of file diff --git a/templates/email/zurich/alert-overdue.txt b/templates/email/zurich/alert-overdue.txt new file mode 100644 index 000000000..90c8ee02f --- /dev/null +++ b/templates/email/zurich/alert-overdue.txt @@ -0,0 +1,13 @@ +Subject: Rückmeldung erforderlich auf FixMyZürich
+
+ +Die folgenden Meldungen wurden eskaliert, da sie nicht innerhalb von fünf Tagen beantwortet worden sind: + +
+<?=$values['data']?> + +
+
+Um diese Meldungen zu bearbeiten, klicken Sie auf folgende URL: +
+<?=$values['admin_url']?>
\ No newline at end of file diff --git a/templates/email/zurich/problem-confirm.txt b/templates/email/zurich/problem-confirm.txt new file mode 100755 index 000000000..e770aa69e --- /dev/null +++ b/templates/email/zurich/problem-confirm.txt @@ -0,0 +1,16 @@ +Subject: Fix My Zürich: Meldung #[% ---report.ID--- | trim %] + +
+
+Guten Tag [% report.name %]
+
+Bitte klicken Sie auf den untenstehenden Link, um Ihre Meldung zu bestätigen. Falls der Link nicht funktioniert, kopieren Sie ihn in Ihren Browser:
+
+[% token_url %]
+
+Ihre Meldung:
+
+[% ---report.details---- %]
+
+
+Dieses E-Mail wurde automatisch generiert. Bitte antworten Sie nicht auf dieses E-Mail.
\ No newline at end of file diff --git a/templates/email/zurich/reply-autoresponse.txt b/templates/email/zurich/reply-autoresponse.txt new file mode 100755 index 000000000..ef5d69d41 --- /dev/null +++ b/templates/email/zurich/reply-autoresponse.txt @@ -0,0 +1,10 @@ +Subject: Automatische Antwort auf Ihr E-Mail
+
+Guten Tag
+
+Dies ist eine automatische Antwort auf Ihr E-Mail. Ihr E-Mail wurde nicht übermittelt.
+
+Falls Sie eine Meldung erfassen möchten, tun Sie das bitte über die Hauptseite:
+[% ---link to FMZ--- %]
+
+Falls Sie Fragen zu Fix My Zürich haben, senden Sie ein E-Mail an gis-zentrum@zuerich.ch
diff --git a/templates/email/zurich/submit.txt b/templates/email/zurich/submit.txt new file mode 100755 index 000000000..a95b02cde --- /dev/null +++ b/templates/email/zurich/submit.txt @@ -0,0 +1,10 @@ +Subject: Fix My Zürich: #<?=----$values['ID']----?> + +
+
+<?=$values['url']?>
+
+
+<?=$values['detail']?> + +
diff --git a/templates/web/default/index-steps.html b/templates/web/default/index-steps.html index 7129241d2..8a83abf07 100644 --- a/templates/web/default/index-steps.html +++ b/templates/web/default/index-steps.html @@ -11,6 +11,7 @@ <li>[% loc('Enter details of the problem') %]</li> [% IF c.cobrand.is_council %] <li>Confirm the report and [% c.cobrand.council_name %] will investigate</li> + [% ELSIF c.cobrand.moniker == 'zurich' %] [% ELSE %] <li>[% loc('We send it to the council on your behalf') %]</li> [% END %] diff --git a/templates/web/default/js/validation_strings.html b/templates/web/default/js/validation_strings.html index 3148d1993..c33bd2b81 100644 --- a/templates/web/default/js/validation_strings.html +++ b/templates/web/default/js/validation_strings.html @@ -17,5 +17,7 @@ }, fms_extra_title: '[% loc('Please enter your title') | replace("'", "\\'") %]', first_name: '[% loc('Please enter your first name') | replace("'", "\\'") %]', - last_name: '[% loc('Please enter your second name') | replace("'", "\\'") %]' + last_name: '[% loc('Please enter your second name') | replace("'", "\\'") %]', + geolocate: '[% loc('or locate me automatically') | replace("'", "\\'") %]', + report_problem_heading: '[% loc('Click map to report a problem') | replace("'", "\\'") %]' }; diff --git a/templates/web/default/report/display.html b/templates/web/default/report/display.html index 6b93539f2..18b4bf51a 100644 --- a/templates/web/default/report/display.html +++ b/templates/web/default/report/display.html @@ -44,173 +44,8 @@ </div> [% INCLUDE 'report/updates.html' %] - -<div id="update_form"> - - <h2> - [% loc( 'Provide an update') %] - </h2> - - [% IF c.cobrand.moniker != 'emptyhomes' %] - <p> - <small>[% loc( 'Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href="/faq#privacy">privacy policy</a>' ) %]</small> - </p> - [% END %] - - [% INCLUDE 'errors.html' %] - - <form method="post" action="[% c.uri_for( '/report/update' ) %]" name="updateForm" class="fieldset validate"[% IF c.cobrand.allow_photo_upload %] enctype="multipart/form-data"[% END %]> - - <input type="hidden" name="submit_update" value="1"> - <input type="hidden" name="id" value="[% problem.id | html %]"> - - [% IF field_errors.update %] - <div class='form-error'>[% field_errors.update %]</div> - [% END %] - <div class="form-field"> - <label for="form_update">[% loc( 'Update:' ) %]</label> - <textarea name="update" id="form_update" rows="7" cols="30" required>[% update.text | html %]</textarea> - </div> - - [% IF c.user && c.user.belongs_to_council( problem.council ) %] - <div class="form-field"> - <label for="form_state">[% loc( 'State:' ) %]</label> - <select name="state" id="form_state"> - [% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating', - loc('Investigating')], ['planned', loc('Planned')], ['in progress', - loc('In Progress')], ['closed', loc('Closed')], ['fixed', loc('Fixed')] ] %] - <option [% 'selected ' IF state.0 == problem.state %] value="[% state.0 %]">[% state.1 %]</option> - [% END %] - </select> - </div> - [% ELSE %] - [% IF problem.is_fixed AND c.user_exists AND c.user.id == problem.user_id %] - <div class="checkbox"> - <input type="checkbox" name="reopen" id="form_reopen" value="1"[% ' checked' IF update.mark_open %]> - <label for="form_reopen">[% loc('This problem has not been fixed') %]</label> - </div> - [% ELSIF !problem.is_fixed %] - <div class="checkbox"> - <input type="checkbox" name="fixed" id="form_fixed" value="1"[% ' checked' IF update.mark_fixed %]> - <label for="form_fixed">[% loc('This problem has been fixed') %]</label> - </div> - [% END %] - [% END %] - - [% IF c.cobrand.allow_photo_upload %] - [% IF field_errors.photo %] - <div class='form-error'>[% field_errors.photo %]</div> - [% END %] - <div id="fileupload_normalUI"> - [% IF upload_fileid %] - <p>[% loc('You have already attached a photo to this update, attaching another one will replace it.') %]</p> - <input type="hidden" name="upload_fileid" value="[% upload_fileid %]"> - [% END %] - <label for="form_photo">[% loc('Photo:') %]</label> - <input type="file" name="photo" id="form_photo" style="width:20em"> - </div> - [% END %] - -[% IF c.user_exists %] - - [% INCLUDE name %] - - <div class="checkbox"> - <input type="submit" id="update_post" value="[% loc('Post') %]"> - </div> - -[% ELSE %] - - [% IF field_errors.email %] - <div class='form-error'>[% field_errors.email %]</div> - [% END %] - <div class="form-field"> - <label for="form_rznvy">[% loc('Your email:' ) %]</label> - <input type="email" name="rznvy" id="form_rznvy" value="[% update.user.email | html %]" size="30" required> - </div> - -<div id="form_sign_in"> - <h3>[% loc("Now to submit your update… do you have a FixMyStreet password?") %]</h3> - - <div id="form_sign_in_yes"> - - [% IF field_errors.password %] - <div class='form-error'>[% field_errors.password %]</div> - [% END %] - - <p> - <label class="n" for="password_sign_in">[% loc('<strong>Yes</strong> I have a password') %]</label> - <input type="password" name="password_sign_in" id="password_sign_in" value="" size="25"> - </p> - - <div class="fieldset"> - - <p> - <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]> - <label class="n" for="remember_me"> - [% loc('Keep me signed in on this computer') %] - </label> - </p> - - <p> - <input type="submit" name="submit_sign_in" id="submit_sign_in" value="[% loc('Post') %]"> - </p> - - </div> - - </div> - <div id="form_sign_in_no"> - - <p>[% loc('<strong>No</strong>, let me confirm my update by email:') %]</p> - - <div class="fieldset"> - - [% INCLUDE name %] - - <div class="form-field"> - <label for="password_register">[% loc('Enter a new password:') %]</label> - <input type="password" name="password_register" id="password_register" value="" size="25"> - </div> - - <p style="clear:both"><small>[% loc('Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.') %]</small></p> - - <p> - <input type="submit" name="submit_register" id="submit_register" value="[% loc('Post') %]"> - </p> - - </div> - - </div> - -</div> - -[% END %] - - </form> -</div> +[% INCLUDE 'report/update-form.html' %] </div> [% INCLUDE 'footer.html' %] - -[% BLOCK name %] - [% IF field_errors.name %] - <div class='form-error'>[% field_errors.name %]</div> - [% END %] - - <div> - <label for="form_name">[% loc('Your name:') %]</label> - <input type="text" name="name" id="form_name" value="[% update.name || c.user.name | html %]" size="25"> - </div> - - <div class="checkbox"> - <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' UNLESS update.anonymous %]> - <label for="form_may_show_name">[% loc('Show my name publicly') %]</label> - <small>[% loc('(we never show your email)') %]</small> - </div> - - <div class="checkbox"> - <input type="checkbox" name="add_alert" id="form_add_alert" value="1"[% ' checked' IF add_alert %]> - <label for="form_add_alert">[% loc( 'Alert me to future updates' ) %]</label> - </div> -[% END %] diff --git a/templates/web/default/report/new/notes.html b/templates/web/default/report/new/notes.html index be605ddaa..68408acc7 100644 --- a/templates/web/default/report/new/notes.html +++ b/templates/web/default/report/new/notes.html @@ -4,7 +4,7 @@ <li>[% loc("We will only use your personal information in accordance with our <a href=\"/faq#privacy\">privacy policy.</a>") %]</li> <li>[% loc("Please be polite, concise and to the point.") %]</li> - <li>[% loc("Please do not be abusive — abusing your council devalues the service for all users.") %]</li> + <li>[% loc("Please do not be abusive — abusing your council devalues the service for all users.") %]</li> <li>[% loc("Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation.") %]</li> <li>[% loc("Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website.") %]</li> diff --git a/templates/web/default/report/update-form.html b/templates/web/default/report/update-form.html new file mode 100644 index 000000000..721e6d4b5 --- /dev/null +++ b/templates/web/default/report/update-form.html @@ -0,0 +1,163 @@ +<div id="update_form"> + + <h2>[% loc( 'Provide an update') %]</h2> + + [% IF c.cobrand.moniker != 'emptyhomes' %] + <p> + <small>[% loc( 'Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href="/faq#privacy">privacy policy</a>' ) %]</small> + </p> + [% END %] + + [% INCLUDE 'errors.html' %] + + <form method="post" action="[% c.uri_for( '/report/update' ) %]" name="updateForm" class="fieldset validate"[% IF c.cobrand.allow_photo_upload %] enctype="multipart/form-data"[% END %]> + + <input type="hidden" name="submit_update" value="1"> + <input type="hidden" name="id" value="[% problem.id | html %]"> + + [% IF field_errors.update %] + <div class='form-error'>[% field_errors.update %]</div> + [% END %] + <div class="form-field"> + <label for="form_update">[% loc( 'Update:' ) %]</label> + <textarea name="update" id="form_update" rows="7" cols="30" required>[% update.text | html %]</textarea> + </div> + + [% IF c.user && c.user.belongs_to_council( problem.council ) %] + <div class="form-field"> + <label for="form_state">[% loc( 'State:' ) %]</label> + <select name="state" id="form_state"> + [% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating', + loc('Investigating')], ['planned', loc('Planned')], ['in progress', + loc('In Progress')], ['closed', loc('Closed')], ['fixed', loc('Fixed')] ] %] + <option [% 'selected ' IF state.0 == problem.state %] value="[% state.0 %]">[% state.1 %]</option> + [% END %] + </select> + </div> + [% ELSE %] + [% IF problem.is_fixed AND c.user_exists AND c.user.id == problem.user_id %] + <div class="checkbox"> + <input type="checkbox" name="reopen" id="form_reopen" value="1"[% ' checked' IF update.mark_open %]> + <label class="inline" for="form_reopen">[% loc('This problem has not been fixed') %]</label> + </div> + [% ELSIF !problem.is_fixed %] + <div class="checkbox"> + <input type="checkbox" name="fixed" id="form_fixed" value="1"[% ' checked' IF update.mark_fixed %]> + <label class="inline" for="form_fixed">[% loc('This problem has been fixed') %]</label> + </div> + [% END %] + [% END %] + + [% IF c.cobrand.allow_photo_upload %] + [% IF field_errors.photo %] + <div class='form-error'>[% field_errors.photo %]</div> + [% END %] + <div id="fileupload_normalUI"> + [% IF upload_fileid %] + <p>[% loc('You have already attached a photo to this update, attaching another one will replace it.') %]</p> + <input type="hidden" name="upload_fileid" value="[% upload_fileid %]"> + [% END %] + <label for="form_photo">[% loc('Photo:') %]</label> + <input type="file" name="photo" id="form_photo" style="width:20em"> + </div> + [% END %] + +[% IF c.user_exists %] + + [% INCLUDE name %] + + <div class="checkbox"> + <input type="submit" id="update_post" value="[% loc('Post') %]"> + </div> + +[% ELSE %] + + [% IF field_errors.email %] + <div class='form-error'>[% field_errors.email %]</div> + [% END %] + <div class="form-field"> + <label for="form_rznvy">[% loc('Your email:' ) %]</label> + <input type="email" name="rznvy" id="form_rznvy" value="[% update.user.email | html %]" size="30" required> + </div> + +<div id="form_sign_in"> + <h3>[% loc("Now to submit your update… do you have a FixMyStreet password?") %]</h3> + + <div id="form_sign_in_yes"> + + [% IF field_errors.password %] + <div class='form-error'>[% field_errors.password %]</div> + [% END %] + + <p> + <label class="n" for="password_sign_in">[% loc('<strong>Yes</strong> I have a password') %]</label> + <input type="password" name="password_sign_in" id="password_sign_in" value="" size="25"> + </p> + + <div class="fieldset"> + + <p> + <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]> + <label class="n" for="remember_me"> + [% loc('Keep me signed in on this computer') %] + </label> + </p> + + <p> + <input type="submit" name="submit_sign_in" id="submit_sign_in" value="[% loc('Post') %]"> + </p> + + </div> + + </div> + <div id="form_sign_in_no"> + + <p>[% loc('<strong>No</strong>, let me confirm my update by email:') %]</p> + + <div class="fieldset"> + + [% INCLUDE name %] + + <div class="form-field"> + <label for="password_register">[% loc('Enter a new password:') %]</label> + <input type="password" name="password_register" id="password_register" value="" size="25"> + </div> + + <p style="clear:both"><small>[% loc('Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.') %]</small></p> + + <p> + <input type="submit" name="submit_register" id="submit_register" value="[% loc('Post') %]"> + </p> + + </div> + + </div> + +</div> + +[% END %] + + </form> +</div> + +[% BLOCK name %] + [% IF field_errors.name %] + <div class='form-error'>[% field_errors.name %]</div> + [% END %] + + <div> + <label for="form_name">[% loc('Your name:') %]</label> + <input type="text" name="name" id="form_name" value="[% update.name || c.user.name | html %]" size="25"> + </div> + + <div class="checkbox"> + <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' UNLESS update.anonymous %]> + <label for="form_may_show_name">[% loc('Show my name publicly') %]</label> + <small>[% loc('(we never show your email)') %]</small> + </div> + + <div class="checkbox"> + <input type="checkbox" name="add_alert" id="form_add_alert" value="1"[% ' checked' IF add_alert %]> + <label class="inline" for="form_add_alert">[% loc( 'Alert me to future updates' ) %]</label> + </div> +[% END %] diff --git a/templates/web/fixmybarangay/footer.html b/templates/web/fixmybarangay/footer.html index 966abacd8..88f18db4b 100644 --- a/templates/web/fixmybarangay/footer.html +++ b/templates/web/fixmybarangay/footer.html @@ -91,18 +91,39 @@ If you want to see any other messages, you'll need to have a manager or admin account on Message Manager: click on the <a href="[% c.config.MESSAGE_MANAGER_URL %]">admin</a> link to get there. </p> - <h3> - Creating a new report from a message - </h3> <p> - If you want to use a message to create a problem report, you'll need to select it first. Click on the radio button. When the message - is selected, it will go bright green. Now when you click on the map, the report will be used to create the report. - </p> - <p> - To stop two people replying to a message at the same time, if anyone else has just started working on it, you'll see a message - warning you, and you won't be able to select the radio button. Normally, if nobody works with a message, such a lock is released - after about 3 minutes. - </p> + [% IF global.is_fmb_creation_page %] + <h3> + Creating a new report from a message + </h3> + <p> + If you want to use a message to create a problem report, you'll need to select it first. Click on the radio button. When the message + is selected, it will go bright green. Now when you click on the map, the report will be used to create the report. + </p> + <p> + To stop two people replying to a message at the same time, if anyone else has just started working on it, you'll see a message + warning you, and you won't be able to select the radio button. Normally, if nobody works with a message, such a lock is released + after about 3 minutes. + </p> + [% ELSE %] + <p> + Click <strong>show messages for this report</strong> to see + the message (or messages) that contributed to this report. Often this will be a single message + if the problem was submitted by SMS. But it will also include any messages that have been + added as updates, as well as any replies that were sent back by barangay staff. + As well as letting you review the background to the report, this also lets you reply (for example, + to notify the original reporter that the problem has been fixed). + </p> + <h3> + Adding a message as an update to this report + </h3> + <p> + If you want to add this message's contents as an update to this report, you'll need to select it first. Click + on the radio button. When the message is selected, it will go bright green. Now when you click on the + <strong>COPY TO UPDATE</strong> button, the message text will be added to this report's update text. + You can edit the text before clicking <strong>POST</strong>. + </p> + [% END %] <h3> Replying to a message </h3> diff --git a/templates/web/fixmybarangay/report/_message_manager.html b/templates/web/fixmybarangay/report/_message_manager.html index 10f627a2e..5f6b515e5 100644 --- a/templates/web/fixmybarangay/report/_message_manager.html +++ b/templates/web/fixmybarangay/report/_message_manager.html @@ -55,7 +55,10 @@ $(document).ready(function() { var $mm_message_list = $('#mm-message-list'); var mm_url = "[% c.config.MESSAGE_MANAGER_URL %]"; // from config + + [%# note that the presence of a problem id implies that this is a report view page, not a problem creation page %] var problem_id = "[% problem.id %]"; + var dummy_busy = false; var fms_username = "[% c.user.email | replace('\@.*', '') %]"; var timeout_id = 0; @@ -119,7 +122,15 @@ $(document).ready(function() { dummy_busy = false; } - message_manager.config({url_root: mm_url, want_nice_msgs: true}); + var custom_tooltips; + if (problem_id) { // this page is viewing, not creating + custom_tooltips = {tt_radio: "Select before clicking 'Copy to Update' to add this message as an update"}; + } + message_manager.config({ + url_root: mm_url, + tooltips: custom_tooltips, + want_nice_msgs: true + }); message_manager.setup_click_listener({callback:mm_selected_message}); // problem form hidden input "external_source_id": pass the MM id into FMS, if used @@ -187,7 +198,6 @@ $(document).ready(function() { {callback:dummy_hide_cleanup}); } }); - $("a#reply").fancybox({onClosed: function(){dummy_busy=false;}}); // only show on problem display page @@ -278,5 +288,6 @@ $(document).ready(function() { </script> [% global.want_fmb_hidden_dialogs = 1 %] +[% global.is_fmb_creation_page = problem.id? 0 : 1 %] [% END %] diff --git a/templates/web/fixmybarangay/reports/index.html b/templates/web/fixmybarangay/reports/index.html new file mode 100755 index 000000000..e46d578ec --- /dev/null +++ b/templates/web/fixmybarangay/reports/index.html @@ -0,0 +1,46 @@ +[% INCLUDE 'header.html', title = loc('Summary reports'), bodyclass => 'fullwidthpage' %] + +<h1>[% loc('All Reports') %]</h1> + +<div class="intro"> +<p> +[% loc('This is a summary of all reports on this site; select a particular barangay to see the reports sent there.') %] + +</p> +<p> + [%# (this will change when we have 'body' logic in place, meanwhile: hardcoded) %] + See also the <a href="/reports/dps">map of DPS reports</a>. +</p> +</div> + +<table cellpadding="3" cellspacing="1" border="0" class="nicetable"> +<thead> +<tr> +<th class="title">[% loc('Name') %]</th> +<th class="data">[% loc('New <br>problems') %]</th> +<th class="data">[% loc('Older <br>problems') %]</th> +<th class="data">[% loc('Old / unknown <br>problems') %]</th> +<th class="data">[% loc('Recently <br>fixed') %]</th> +<th class="data">[% loc('Older <br>fixed') %]</th> +</tr> +</thead> + +<tbody> +[% FOREACH area IN areas_info_sorted %] +<tr align="center" +[%- IF area.generation_high == 10 %] class="gone" +[%- ELSIF ! (loop.count % 2) %] class="a" +[%- END %]> +<td class="title"><a href="[% area.url %]">[% area.name %]</a></td> +<td class="data">[% open.${area.id}.new or 0 %]</td> +<td class="data">[% open.${area.id}.older or 0 %]</td> +<td class="data">[% open.${area.id}.unknown or 0 %]</td> +<td class="data">[% fixed.${area.id}.new or 0 %]</td> +<td class="data">[% fixed.${area.id}.old or 0 %]</td> +</tr> +[% TRY %][% PROCESS "reports/_extras.html" %][% CATCH file %][% END %] +[% END %] +</tbody> +</table> + +[% INCLUDE 'footer.html', pagefooter = 'yes' %] diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html index 8c6498448..26e6fe992 100644 --- a/templates/web/fixmystreet/report/display.html +++ b/templates/web/fixmystreet/report/display.html @@ -8,8 +8,6 @@ rss = [ loc('Updates to this problem, FixMyStreet'), "/rss/$problem.id" ] robots = 'index, nofollow' bodyclass = 'mappage'; - - allow_creation = !c.cobrand.only_authed_can_create || (c.user && c.user.from_council); %] [% map_html %] @@ -66,154 +64,5 @@ </div> [% INCLUDE 'report/updates.html' %] - -[% IF allow_creation %] -<div id="update_form"> - <h2>[% loc( 'Provide an update') %]</h2> - - [% IF c.cobrand.moniker != 'emptyhomes' AND c.cobrand.moniker != 'stevenage' %] - <div class="general-sidebar-notes"> - [% INCLUDE 'report/updates-sidebar-notes.html' %] - </div> - [% END %] - - [% INCLUDE 'errors.html' %] - - <form method="post" action="[% c.uri_for( '/report/update' ) %]" id="form_update_form" name="updateForm" class="validate"[% IF c.cobrand.allow_photo_upload %] enctype="multipart/form-data"[% END %]> - <fieldset> - <input type="hidden" name="submit_update" value="1"> - <input type="hidden" name="id" value="[% problem.id | html %]"> - - <label for="form_update">[% loc( 'Update' ) %]</label> - [% IF field_errors.update %] - <div class='form-error'>[% field_errors.update %]</div> - [% END %] - <textarea rows="7" cols="30" name="update" id="form_update" placeholder="[% loc('Please write your update here') %]" required>[% update.text | html %]</textarea> - - [% IF c.user && c.user.belongs_to_council( problem.council ) %] - <label for="form_state">[% loc( 'State' ) %]</label> - <select name="state" id="form_state"> - [% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating', - loc('Investigating')], ['planned', loc('Planned')], ['in progress', - loc('In Progress')], ['closed', loc('Closed')], ['fixed', loc('Fixed')] ] %] - <option [% 'selected ' IF state.0 == problem.state %] value="[% state.0 %]">[% state.1 %]</option> - [% END %] - </select> - [% ELSE %] - [% IF problem.is_fixed AND c.user_exists AND c.user.id == problem.user_id %] - - <input type="checkbox" name="reopen" id="form_reopen" value="1"[% ' checked' IF update.mark_open %]> - <label class="inline" for="form_reopen">[% loc('This problem has not been fixed') %]</label> - - [% ELSIF !problem.is_fixed %] - - <div class="checkbox-group"> - <input type="checkbox" name="fixed" id="form_fixed" value="1"[% ' checked' IF update.mark_fixed %]> - <label class="inline" for="form_fixed">[% loc('This problem has been fixed') %]</label> - </div> - - [% END %] - [% END %] - - [% IF c.cobrand.allow_photo_upload %] - <div id="fileupload_normalUI"> - [% IF upload_fileid %] - <img align="right" src="/photo/[% upload_fileid %].temp.jpeg" alt=""> - <p>[% loc('You have already attached a photo to this update, attaching another one will replace it.') %]</p> - <input type="hidden" name="upload_fileid" value="[% upload_fileid %]"> - [% END %] - <label for="form_photo">[% loc('Photo') %]</label> - [% IF field_errors.photo %] - <p class='form-error'>[% field_errors.photo %]</p> - [% END %] - <input type="file" name="photo" id="form_photo"> - </div> - [% END %] - - [% IF c.user_exists %] - - [% INCLUDE name %] - - <input class="final-submit green-btn" type="submit" id="update_post" value="[% loc('Post') %]"> - - - [% ELSE %] - - <label for="form_rznvy">[% loc('Email' ) %]</label> - [% IF field_errors.email %] - <p class='form-error'>[% field_errors.email %]</p> - [% END %] - <input type="email" name="rznvy" id="form_rznvy" value="[% update.user.email | html %]" placeholder="[% loc('Your email address' ) %]" required> - - <div id="form_sign_in"> - <h3>[% loc("Now to submit your update…") %]</h3> - <h2>[% loc("Do you have a FixMyStreet password?") %]</h2> - - <div id="form_sign_in_yes" class="form-box"> - <h5>[% loc('<strong>Yes</strong> I have a password') %]</h5> - - <label class="hidden-js n" for="password_sign_in">[% loc('Yes I have a password') %]</label> - [% IF field_errors.password %] - <p class='form-error'>[% field_errors.password %]</p> - [% END %] - <div class="form-txt-submit-box"> - <input type="password" name="password_sign_in" id="password_sign_in" value="" placeholder="[% loc('Your password') %]"> - <input class="green-btn" type="submit" name="submit_sign_in" id="submit_sign_in" value="[% loc('Post') %]"> - </div> - - <div class="checkbox-group"> - <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]> - <label class="inline n" for="remember_me">[% loc('Keep me signed in on this computer') %]</label> - </div> - - <div class="general-sidebar-notes" id="forgotten-pw"> - <p class="dark">[% loc('Forgotten your password?') %]</p> - <p>[% loc('Confirm by email below, providing a new password at that point. When you confirm, your password will be updated.') %]</p> - </div> - - </div> - <div id="form_sign_in_no" class="form-box"> - <h5>[% loc('<strong>No</strong> Let me confirm my update by email') %]</h5> - - [% INCLUDE name %] - - <div class="general-sidebar-notes"> - <p class="dark">[% loc('We never show your email') %]</p> - <p>[% loc('Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.') %]</p> - </div> - - <label for="password_register">[% loc('Password (optional)') %]</label> - - <div class="form-txt-submit-box"> - <input type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]"> - <input class="green-btn" type="submit" name="submit_register" id="submit_register" value="[% loc('Post') %]"> - </div> - </div> - </div> - - [% END %] - </fieldset> - </form> -</div> -[% END %] - - +[% INCLUDE 'report/update-form.html' %] [% INCLUDE 'footer.html' %] - -[% BLOCK name %] - [% INCLUDE 'report/new/extra_name.html' %] - <label for="form_name">[% loc('Name') %]</label> - [% IF field_errors.name %] - <p class='form-error'>[% field_errors.name %]</p> - [% END %] - <input type="text" [% IF problem.council == '2482' %]class="validName" [% END %]name="name" id="form_name" value="[% update.name || c.user.name | html %]" placeholder="[% loc('Your name') %]"> - - <div class="checkbox-group"> - <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' UNLESS update.anonymous %]> - <label class="inline" for="form_may_show_name">[% loc('Show my name publicly') %]</label> - </div> - <div class="checkbox-group"> - <input type="checkbox" name="add_alert" id="form_add_alert" value="1"[% ' checked' IF add_alert %]> - <label class="inline" for="form_add_alert">[% loc( 'Alert me to future updates' ) %]</label> - </div> -[% END %] diff --git a/templates/web/fixmystreet/report/new/fill_in_details_text.html b/templates/web/fixmystreet/report/new/fill_in_details_text.html index b9ce7e110..05527bb24 100644 --- a/templates/web/fixmystreet/report/new/fill_in_details_text.html +++ b/templates/web/fixmystreet/report/new/fill_in_details_text.html @@ -1,9 +1,6 @@ [% IF area_ids_to_list.size != 0; - loc('The council won’t be able to help unless you leave as much -detail as you can. Please describe the exact location of the problem (e.g. on a -wall), what it is, how long it has been there, a description (and a photo of -the problem if you have one), etc.'); + loc('The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc.'); IF category_extras; ' ' _ loc('Some categories may require additional information.'); END; diff --git a/templates/web/fixmystreet/report/new/notes.html b/templates/web/fixmystreet/report/new/notes.html index aa73f0694..d508b1929 100644 --- a/templates/web/fixmystreet/report/new/notes.html +++ b/templates/web/fixmystreet/report/new/notes.html @@ -3,7 +3,7 @@ <ul class="plain-list"> <li>[% loc("We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>") %]</li> <li>[% loc("Please be polite, concise and to the point.") %]</li> - <li>[% loc("Please do not be abusive — abusing your council devalues the service for all users.") %]</li> + <li>[% loc("Please do not be abusive — abusing your council devalues the service for all users.") %]</li> <li>[% loc("Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation.") %]</li> <li>[% loc("Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website.") %]</li> </ul> diff --git a/templates/web/fixmystreet/report/update-form.html b/templates/web/fixmystreet/report/update-form.html new file mode 100644 index 000000000..c08ac4d52 --- /dev/null +++ b/templates/web/fixmystreet/report/update-form.html @@ -0,0 +1,148 @@ +[% allow_creation = !c.cobrand.only_authed_can_create || (c.user && c.user.from_council) %] +[% IF allow_creation %] +<div id="update_form"> + <h2>[% loc( 'Provide an update') %]</h2> + + [% IF c.cobrand.moniker != 'emptyhomes' AND c.cobrand.moniker != 'stevenage' %] + <div class="general-sidebar-notes"> + [% INCLUDE 'report/updates-sidebar-notes.html' %] + </div> + [% END %] + + [% INCLUDE 'errors.html' %] + + <form method="post" action="[% c.uri_for( '/report/update' ) %]" id="form_update_form" name="updateForm" class="validate"[% IF c.cobrand.allow_photo_upload %] enctype="multipart/form-data"[% END %]> + <fieldset> + <input type="hidden" name="submit_update" value="1"> + <input type="hidden" name="id" value="[% problem.id | html %]"> + + <label for="form_update">[% loc( 'Update' ) %]</label> + [% IF field_errors.update %] + <div class='form-error'>[% field_errors.update %]</div> + [% END %] + <textarea rows="7" cols="30" name="update" id="form_update" placeholder="[% loc('Please write your update here') %]" required>[% update.text | html %]</textarea> + + [% IF c.user && c.user.belongs_to_council( problem.council ) %] + <label for="form_state">[% loc( 'State' ) %]</label> + <select name="state" id="form_state"> + [% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating', + loc('Investigating')], ['planned', loc('Planned')], ['in progress', + loc('In Progress')], ['closed', loc('Closed')], ['fixed', loc('Fixed')] ] %] + <option [% 'selected ' IF state.0 == problem.state %] value="[% state.0 %]">[% state.1 %]</option> + [% END %] + </select> + [% ELSE %] + [% IF problem.is_fixed AND c.user_exists AND c.user.id == problem.user_id %] + + <input type="checkbox" name="reopen" id="form_reopen" value="1"[% ' checked' IF update.mark_open %]> + <label class="inline" for="form_reopen">[% loc('This problem has not been fixed') %]</label> + + [% ELSIF !problem.is_fixed %] + + <div class="checkbox-group"> + <input type="checkbox" name="fixed" id="form_fixed" value="1"[% ' checked' IF update.mark_fixed %]> + <label class="inline" for="form_fixed">[% loc('This problem has been fixed') %]</label> + </div> + + [% END %] + [% END %] + + [% IF c.cobrand.allow_photo_upload %] + <div id="fileupload_normalUI"> + [% IF upload_fileid %] + <img align="right" src="/photo/[% upload_fileid %].temp.jpeg" alt=""> + <p>[% loc('You have already attached a photo to this update, attaching another one will replace it.') %]</p> + <input type="hidden" name="upload_fileid" value="[% upload_fileid %]"> + [% END %] + <label for="form_photo">[% loc('Photo') %]</label> + [% IF field_errors.photo %] + <p class='form-error'>[% field_errors.photo %]</p> + [% END %] + <input type="file" name="photo" id="form_photo"> + </div> + [% END %] + + [% IF c.user_exists %] + + [% INCLUDE name %] + + <input class="final-submit green-btn" type="submit" id="update_post" value="[% loc('Post') %]"> + + + [% ELSE %] + + <label for="form_rznvy">[% loc('Email' ) %]</label> + [% IF field_errors.email %] + <p class='form-error'>[% field_errors.email %]</p> + [% END %] + <input type="email" name="rznvy" id="form_rznvy" value="[% update.user.email | html %]" placeholder="[% loc('Your email address' ) %]" required> + + <div id="form_sign_in"> + <h3>[% loc("Now to submit your update…") %]</h3> + <h2>[% loc("Do you have a FixMyStreet password?") %]</h2> + + <div id="form_sign_in_yes" class="form-box"> + <h5>[% loc('<strong>Yes</strong> I have a password') %]</h5> + + <label class="hidden-js n" for="password_sign_in">[% loc('Yes I have a password') %]</label> + [% IF field_errors.password %] + <p class='form-error'>[% field_errors.password %]</p> + [% END %] + <div class="form-txt-submit-box"> + <input type="password" name="password_sign_in" id="password_sign_in" value="" placeholder="[% loc('Your password') %]"> + <input class="green-btn" type="submit" name="submit_sign_in" id="submit_sign_in" value="[% loc('Post') %]"> + </div> + + <div class="checkbox-group"> + <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]> + <label class="inline n" for="remember_me">[% loc('Keep me signed in on this computer') %]</label> + </div> + + <div class="general-sidebar-notes" id="forgotten-pw"> + <p class="dark">[% loc('Forgotten your password?') %]</p> + <p>[% loc('Confirm by email below, providing a new password at that point. When you confirm, your password will be updated.') %]</p> + </div> + + </div> + <div id="form_sign_in_no" class="form-box"> + <h5>[% loc('<strong>No</strong> Let me confirm my update by email') %]</h5> + + [% INCLUDE name %] + + <div class="general-sidebar-notes"> + <p class="dark">[% loc('We never show your email') %]</p> + <p>[% loc('Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.') %]</p> + </div> + + <label for="password_register">[% loc('Password (optional)') %]</label> + + <div class="form-txt-submit-box"> + <input type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]"> + <input class="green-btn" type="submit" name="submit_register" id="submit_register" value="[% loc('Post') %]"> + </div> + </div> + </div> + + [% END %] + </fieldset> + </form> +</div> +[% END %] + +[% BLOCK name %] + [% INCLUDE 'report/new/extra_name.html' %] + <label for="form_name">[% loc('Name') %]</label> + [% IF field_errors.name %] + <p class='form-error'>[% field_errors.name %]</p> + [% END %] + <input type="text" [% IF problem.council == '2482' %]class="validName" [% END %]name="name" id="form_name" value="[% update.name || c.user.name | html %]" placeholder="[% loc('Your name') %]"> + + <div class="checkbox-group"> + <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' UNLESS update.anonymous %]> + <label class="inline" for="form_may_show_name">[% loc('Show my name publicly') %]</label> + </div> + <div class="checkbox-group"> + <input type="checkbox" name="add_alert" id="form_add_alert" value="1"[% ' checked' IF add_alert %]> + <label class="inline" for="form_add_alert">[% loc( 'Alert me to future updates' ) %]</label> + </div> +[% END %] diff --git a/templates/web/zurich/around/intro.html b/templates/web/zurich/around/intro.html new file mode 100644 index 000000000..c113afca7 --- /dev/null +++ b/templates/web/zurich/around/intro.html @@ -0,0 +1 @@ + <h1>[% loc('Report, view, or discuss local problems') %]</h1> diff --git a/templates/web/zurich/footer.html b/templates/web/zurich/footer.html new file mode 100644 index 000000000..2e4717360 --- /dev/null +++ b/templates/web/zurich/footer.html @@ -0,0 +1,31 @@ + </div><!-- .content role=main --> + </div><!-- .container --> + </div><!-- .table-cell --> + + <div class="nav-wrapper"> + <div class="nav-wrapper-2"> + <div id="main-nav" role="navigation"> + <ul id="main-menu"> + <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] + >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/reports"[% END + %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END + %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li> + </ul> + </div> + </div> + </div> + +<!-- [% INCLUDE 'debug_footer.html' %] --> + </div> <!-- .wrapper --> + + <div id="zurich-footer" class="desk-only"> + © 2012 Stadt Zürich + <span class="hidden">|</span> <a href="http://www.stadt-zuerich.ch/content/portal/de/index/footer/rechtliche_hinweise.html">Rechtliche Hinweise</a> + <span class="hidden">|</span> <a href="http://www.stadt-zuerich.ch/content/portal/de/index/footer/impressum.html">Impressum</a> + <span class="hidden">|</span> <a href="http://www.stadt-zuerich.ch/content/portal/de/index/footer/barrierefreiheit.html">Barrierefreiheit</a> + </div> + +</body> +</html> diff --git a/templates/web/zurich/maps/zurich.html b/templates/web/zurich/maps/zurich.html new file mode 100644 index 000000000..492ccc556 --- /dev/null +++ b/templates/web/zurich/maps/zurich.html @@ -0,0 +1,14 @@ +[% map_js = BLOCK %] +<script type="text/javascript" src="[% version('/js/OpenLayers.2.11.zurich.js') %]"></script> +<script type="text/javascript" src="[% version('/js/OpenLayers.Projection.CH1903.js') %]"></script> +<script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script> +<script type="text/javascript" src="[% version('/js/map-wmts-zurich.js') %]"></script> +<script type="text/javascript" src="[% version('/js/jquery.ba-hashchange.min.js') %]"></script> +<!--[if lte IE 6]> + <link rel="stylesheet" href="/jslib/OpenLayers-2.10/theme/default/ie6-style.css" type="text/css" /> +<![endif]--> +[% END %] + +[% map_html = BLOCK %] +[% INCLUDE maps/openlayers.html %] +[% END %] diff --git a/templates/web/zurich/report/new/fill_in_details_form.html b/templates/web/zurich/report/new/fill_in_details_form.html new file mode 100644 index 000000000..a4029c527 --- /dev/null +++ b/templates/web/zurich/report/new/fill_in_details_form.html @@ -0,0 +1,136 @@ +<div id="report-a-problem-main"> + <h1>[% loc('Reporting a problem') %]</h1> + + [% IF js %] + <p id="councils_text"> + [% + tprintf( + loc('All the information you provide here will be sent to <strong>%s</strong>.'), + loc('the local council') + ); + %] + [% loc('The subject and details of the problem will be public, plus your name if you give us permission.') %] + </p> + [% ELSE %] + [% PROCESS 'report/new/councils_text.html' %] + [% END %] + + <div id="report-a-problem-sidebar"> + <!-- + The text for this section needs checking, but I can't work out which bit comes from where + --> + <div class="sidebar-tips"> + [% IF report.used_map %] + [% IF partial_token %] + <p id="unknown">[% loc('Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit.') %]</p> + [% END %] + <p>[% loc('You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. ') %]</p> + [% END %] + + <p> + [% IF report.used_map %] + [% INCLUDE 'report/new/fill_in_details_text.html' %] + [% ELSE %] + [% loc('Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box.') %] + [% END %] + </p> + </div> + + <div class="sidebar-notes"> + [% INCLUDE 'report/new/notes.html' %] + </div> + + </div> + + [% INCLUDE 'errors.html' %] + <fieldset> + <div id="problem_form"> + + [% INCLUDE 'report/new/form_heading.html' %] + + + [% IF field_errors.council %] + <p class='form-error'>[% field_errors.council %]</p> + [% END %] + + <label for="form_detail">[% loc('Details') %]</label> + [% IF field_errors.detail %] + <p class='form-error'>[% field_errors.detail %]</p> + [% END %] + <textarea rows="7" cols="26" name="detail" id="form_detail" placeholder="[% loc('Please fill in details of the problem.') %]" required>[% report.detail | html %]</textarea> + + [% IF js %] + <div id="form_category_row"> + <label for="form_category">[% loc('Category') %]</label> + <select name="category" id="form_category" required><option>[% loc('Loading...') %]</option></select> + </div> + [% ELSE %] + [% IF category_options.size %] + [% IF field_errors.category %] + <p class='form-error'>[% field_errors.category %]</p> + [% END %] + + [% PROCESS "report/new/category.html" %] + [% END %] + [% END %] + + [%- IF category_extras %] + [% PROCESS "report/new/category_extras.html" %] + [%- END %] + + [% IF c.cobrand.allow_photo_upload %] + <label for="form_photo">[% loc('Photo') %]</label> + [% IF upload_fileid || report.photo %] + [% IF upload_fileid %] + <img align="right" src="/photo/[% upload_fileid %].temp.jpeg" alt=""> + <input type="hidden" name="upload_fileid" value="[% upload_fileid %]"> + [% END %] + + <p>[% loc('You have already attached a photo to this report, attaching another one will replace it.') %]</p> + + [% IF report.photo %] + <img align="right" src="/photo/[% report.id %].jpeg"> + [% END %] + [% END %] + + [% IF field_errors.photo %] + <p class='form-error'>[% field_errors.photo %]</p> + [% END %] + <input type="file" name="photo" id="form_photo"> + [% END %] + + <label for="form_email">[% loc('Your email') %]</label> + [% IF field_errors.email %] + <p class='form-error'>[% field_errors.email %]</p> + [% END %] + <input type="email" value="[% report.user.email | html %]" name="email" id="form_email" placeholder="[% loc('Please enter your email address') %]" required> + + <!-- + <div class="general-sidebar-notes"> + <p class="dark">[% loc('We never show your email address or phone number.') %]</p> + </div> + --> + + <label for="form_name">[% loc('Name') %] [% loc('(optional)') %]</label> + [% IF field_errors.name %] + <p class='form-error'>[% field_errors.name %]</p> + [% END %] + <input type="text" value="[% report.name | html %]" name="name" id="form_name" placeholder="[% loc('Your name') %]"> + + <label for="form_phone">[% loc('Phone number (optional)') %]</label> + <input type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number') %]"> + + <div class="form-txt-submit-box"> + [%# ID of submit_sign_in so name can be option, name of submit_register so it doesn't try and sign us in %] + <p><input class="green-btn" type="submit" id="submit_sign_in" name="submit_register" value="[% loc('Submit') %]"> + </div> + + </div> + </fieldset> + + [% IF partial_token %] + <input type="hidden" name="partial" value="[% partial_token.token %]"> + [% END %] + + <input type="hidden" name="submit_problem" value="1"> +</div> diff --git a/templates/web/zurich/report/update-form.html b/templates/web/zurich/report/update-form.html new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/templates/web/zurich/report/update-form.html diff --git a/web/cobrands/barnet/_colours.scss b/web/cobrands/barnet/_colours.scss index 2f5ccc42b..793a8dcdd 100644 --- a/web/cobrands/barnet/_colours.scss +++ b/web/cobrands/barnet/_colours.scss @@ -4,6 +4,8 @@ $primary: #E9E9EA; $primary_b: #000000; $primary_text: #3E3D44; -$contrast1: #E1E3E4; -$contrast1_dark: darken(#E1E3E4, 10%); -$contrast2: #AA8D11; +$col_click_map: #E1E3E4; +$col_click_map_dark: darken(#E1E3E4, 10%); + +$col_fixed_label: #00BD08; +$col_fixed_label_dark: #4B8304; diff --git a/web/cobrands/barnet/layout.scss b/web/cobrands/barnet/layout.scss index 483f1f20f..3ea439dea 100644 --- a/web/cobrands/barnet/layout.scss +++ b/web/cobrands/barnet/layout.scss @@ -21,15 +21,11 @@ } #front-main { - background: $primary; @include border-radius(1em 1em 0 0); margin-bottom: 1em; padding-top: 0; width: 678px; // layout sets this because base has it slightly lighter - h2 { - color: $primary_text; - } #front-main-container { padding: 1em; } @@ -250,7 +246,6 @@ ol.big-numbers > li::before { } p#fixed { padding-top: 4em; - background: #00BD08; } } diff --git a/web/cobrands/bromley/_colours.scss b/web/cobrands/bromley/_colours.scss index e178c9db2..208154370 100644 --- a/web/cobrands/bromley/_colours.scss +++ b/web/cobrands/bromley/_colours.scss @@ -1,9 +1,12 @@ /* COLOURS */ -$primary: rgb(91,120,147); +$bromley_blue: rgb(91,120,147); + +$primary: $bromley_blue; $primary_b: #000000; $primary_text: #ffffff; -$contrast1: rgb(91,120,147); -$contrast1_dark: darken(rgb(91,120,147), 10%); -$contrast2: #AA8D11; +$col_click_map: $bromley_blue; +$col_click_map_dark: darken($bromley_blue, 10%); +$col_fixed_label: $bromley_blue; +$col_fixed_label_dark: darken($bromley_blue, 10%); diff --git a/web/cobrands/bromley/layout.scss b/web/cobrands/bromley/layout.scss index eef0ee679..6fa4c1c7c 100644 --- a/web/cobrands/bromley/layout.scss +++ b/web/cobrands/bromley/layout.scss @@ -44,17 +44,9 @@ body.twothirdswidthpage .content { } #front-main { - background: $primary; @include border-radius(1em 1em 0 0); margin: 2em 1em 0; padding-top: 0; - // layout sets this because base has it slightly lighter - h2 { - color: $primary_text; - } - a#geolocate_link { - color: $primary_text; - } } // Don't want gap that normal site has diff --git a/web/cobrands/default/_colours.scss b/web/cobrands/default/_colours.scss index 2c044a6e7..147fb70f2 100644 --- a/web/cobrands/default/_colours.scss +++ b/web/cobrands/default/_colours.scss @@ -1,9 +1,14 @@ /* COLOURS */ -$primary: #ff9900; +$orange: #ff9900; +$bluey: #6688ff; + +$primary: $orange; $primary_b: #000000; $primary_text: #222222; -$contrast1: #6688ff; -$contrast1_dark: darken(#6688ff, 10%); -$contrast2: #AA8D11; +$col_click_map: $bluey; +$col_click_map_dark: darken($bluey, 10%); + +$col_fixed_label: #00BD08; +$col_fixed_label_dark: #4B8304; diff --git a/web/cobrands/default/layout.scss b/web/cobrands/default/layout.scss index 93a3f7120..7e33d3f1f 100644 --- a/web/cobrands/default/layout.scss +++ b/web/cobrands/default/layout.scss @@ -9,31 +9,13 @@ and similar. */ body { - background: #6688ff; + background: $bluey; } -#front-main { - color: $primary_text; - background: $primary; - // layout sets this because base has it slightly lighter - h2 { - color: $primary_text; - } - a#geolocate_link { - color: $primary_text; - } -} - -.nav-wrapper { - .nav-wrapper-2 { - border-top: 4px solid $primary; - @include border-image(none); - } -} body.mappage { .nav-wrapper { .nav-wrapper-2 { - background: $contrast1; + background: $bluey; } } } @@ -52,9 +34,6 @@ body.mappage { } } } - &#mysoc-menu { - background: $primary; - } } } diff --git a/web/cobrands/fixmybarangay/_colours.scss b/web/cobrands/fixmybarangay/_colours.scss index fcaba8924..2e9b1affa 100644 --- a/web/cobrands/fixmybarangay/_colours.scss +++ b/web/cobrands/fixmybarangay/_colours.scss @@ -4,6 +4,7 @@ $primary: #fff; //E6DBD6 $primary_b: #000000; $primary_text: #222222; -$contrast1: #00BD08; -$contrast1_dark: #4B8304; -$contrast2: #AA8D11; +$col_click_map: #00BD08; +$col_click_map_dark: #4B8304; +$col_fixed_label: #00BD08; +$col_fixed_label_dark: #4B8304; diff --git a/web/cobrands/fixmybarangay/base.scss b/web/cobrands/fixmybarangay/base.scss index 71c2d8205..7257f63cd 100644 --- a/web/cobrands/fixmybarangay/base.scss +++ b/web/cobrands/fixmybarangay/base.scss @@ -3,11 +3,13 @@ @import "../fixmystreet/_mixins"; @import "compass"; +$image-sprite: 'images/sprite.png'; + @import "../fixmystreet/_base"; #site-logo{ width: 225px !important; - background: url('images/sprite.png') -3px -3px no-repeat; + background: url($image-sprite) -3px -3px no-repeat; } #barangay_buttons { @@ -32,25 +34,7 @@ body.mappage .nav-wrapper div.nav-wrapper-2 { background: #fff; } +.ie6 #site-logo { + background-image: url('images/ie_logo.png'); +} -// Replace Sprite with cobrand sprite -.ie6 #site-logo, -.ie7 #site-logo, -.ie6 body.frontpage #site-logo, -.ie6 #main-nav ul#mysoc-menu li a#mysoc-logo, -.ie7 #main-nav ul#mysoc-menu li a#mysoc-logo, -#fms_pan_zoom_panup, #fms_pan_zoom_pandown, -#fms_pan_zoom_panleft, -#fms_pan_zoom_panright, -#fms_pan_zoom_zoomin, -#fms_pan_zoom_zoomout, -.button-right, -a.button-right, -:hover.button-right, -a:hover.button-right, -.button-left, -a.button-left, -:hover.button-left, -a:hover.button-left { - background-image: url('images/sprite.png'); -}
\ No newline at end of file diff --git a/web/cobrands/fixmybarangay/layout.scss b/web/cobrands/fixmybarangay/layout.scss index ccbf00748..4676f8486 100644 --- a/web/cobrands/fixmybarangay/layout.scss +++ b/web/cobrands/fixmybarangay/layout.scss @@ -1,4 +1,7 @@ @import "_colours"; + +$image-sprite: 'images/sprite.png'; + @import "../fixmystreet/_layout"; @mixin box_round($radius) { @@ -12,6 +15,7 @@ body { background: #C7B299; background-image: url(images/pat3.png); + color: $primary_text; .wrapper{ background: url('images/city7.png') 30% 0% repeat-x; @@ -19,22 +23,26 @@ body { } - body.frontpage { - #site-logo{ - width: 370px !important; - height: 70px; - background: url('images/sprite.png') -3px -106px no-repeat; - } - - .wrapper{ - background: url('images/city7.png') 30% 0% repeat-x; - } +body.frontpage { + #site-logo { + width: 370px !important; + height: 70px; + background: url('images/sprite.png') -3px -106px no-repeat; + } + + .wrapper { + background: url('images/city7.png') 30% 0% repeat-x; + } +} + +.ie6 body.frontpage #site-logo { + background-image: url(images/ie_front_logo.gif); } + #main-nav ul#mysoc-menu li a#mysoc-logo { background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIkAAAAyCAMAAABf9whNAAAA0lBMVEUAAABAQEBAQEBAQEBNTU1NTU1AQEBNTU1AQEBAQEBAQEBAQEBAQEBAQEBAQEBNTU1NTU1AQEBNTU1AQEBNTU1AQEBAQEBNTU2Mxj9NTU33kx5NTU1NTU1NTU3tHCRmLZEpq+JNTU2TJ4/tHCSTJ4/87iEpq+L3kx5NTU387iH87iHtHCSTJ4/3kx51K5CTJ49mLZGMxj/tHCSx0zVmLZH6wSBmLZFmLZFDdb/zYCFbuZGMxj/3kx5AQEBNTU0pq+LtHCSMxj/3kx787iFmLZGTJ49ns3BGAAAAPXRSTlMAQL+AQIAQECBwMGBQj98gn5/Pr+/vzzC/r79wYI9wv69QcK+vcICfv68QQBAwj0AwMBBggIBQr3BwgEBgSmaQCwAAAflJREFUeF7t1Ndy2zAQhtGfAAX2IpFUseSSOLGd3nt27bT3f6UsQHusRFcKmVxkcGa4wvCG34AQ8V/wPM/zPM8zSaOaxGBHtFpF+IfikqwYO0LmELfiHH/XlLokSBrsiurtPdGkMJJFWFWTSQUZC0RhWMFNRQWuvTw9RS/VOolNEBgAudYpkE5pHqRpEACIZQ4x4RkztxMWd6KWa2DDvFDUBeg9urr6cPAZMIqEDogCmDmJKdwtlbjXOCc1sIRnhyxj0vIMNbeQMUNun5DBOTo6/3oASMhUF6krka3IM1lkikqdGaICMVE2sKSNICkR1sxYyMag5TWQd7bFPH4G8eT8zcOUKIGwJUYuSE7hzoldlZAwM7Dkwg4GQjtmXMtvBZHNiZJ7P+5C3P/2oH9SXyKXo1yJq0sbmmLMkg23h7xCryR1W5L8WqKsmz1BSbqjfNSSiMUGMEB/Bp8ePwdeLF/ZAn1TEssFR1MJIZmyGLUENXNrI8pCK6IMx99fn50tvyyBcuvEKuqKXDcuocgAQ/I7conMGgA5BfD23fvLy4/LT0Ba/v4vphRxR9dnlmIMU4ULO0IgsgPr/rya3H7F4JycoCf3sq0vW5ICiLXO3YtsMC4JqbG3uCFKMSb3nYuwNyLKMK6Q6wj7a7oMY4vwJwwG8TzP8zzP834CEcRJKkEhVogAAAAASUVORK5CYII="); } #front-main { - color: $primary_text; background: rgba(255,255,255,0.1); margin-top: 70px; @@ -52,16 +60,9 @@ body { } } -.nav-wrapper { - .nav-wrapper-2 { - border-top: solid 4px $primary; - @include border-image(none); - } -} #main-nav { ul { &#mysoc-menu { - background:$primary; padding: 1px 0.5em; } &#main-menu{ @@ -132,4 +133,4 @@ body #main-nav ul#main-menu li span } } -@import "message_manager";
\ No newline at end of file +@import "message_manager"; diff --git a/web/cobrands/fixmybarangay/message_manager.scss b/web/cobrands/fixmybarangay/message_manager.scss index d2b7739c2..120bea4ba 100644 --- a/web/cobrands/fixmybarangay/message_manager.scss +++ b/web/cobrands/fixmybarangay/message_manager.scss @@ -97,9 +97,6 @@ p.mm-submitted-by-sms { #mm-message-list { ul { - &.mm-archive { - display: none; // archive only shown on interaction - } list-style-type: none; padding: 0; margin: 0; @@ -108,7 +105,6 @@ p.mm-submitted-by-sms { clear: both; margin: 4px 0 0 0; padding: 0; - cursor: pointer; background-color: $color_bg_mm_list; p { background-color: inherit; @@ -146,14 +142,15 @@ p.mm-submitted-by-sms { &.msg-is-busy { background-color: #ffd;} &.msg-is-owned { background-color: #dfd;} &.msg-is-active { - background-color: $contrast1; color:#fff; - p:hover { background-color: $contrast1; color:#fff; } // fix for mouseover on p + background-color: $col_click_map; color:#fff; + p:hover { background-color: $col_click_map; color:#fff; } // fix for mouseover on p p.mm-reply:hover {background-color: #eef; color:#000;} // fix for mouseover on p } span.msg-tag { width: 3em; float:left; } + .mm-radio-filler, input[type=radio] { display: block; float: left; @@ -163,6 +160,10 @@ p.mm-submitted-by-sms { font-weight: normal; margin: 0.1em 0 0.1em 4.5em; } + .mm-radio-filler { + margin:0; + padding:0; + } .mm-msg-action { display: none; padding: 0.2em 0.4em; @@ -175,14 +176,23 @@ p.mm-submitted-by-sms { .mm-hide { right:0px; background-color: $color_bg_btn_hide; + cursor: pointer; } .mm-info { right:1.5em; background-color: $color_bg_btn_info; + cursor: pointer; } .mm-rep { right:2.6em; background-color: $color_bg_btn_reply; + cursor: pointer; + } + } + &.mm-archive { + display: none; // archive only shown on interaction + li label { + cursor: default; } } } diff --git a/web/cobrands/fixmybarangay/message_manager_client.js b/web/cobrands/fixmybarangay/message_manager_client.js index e9a5c8d6b..11f9c1264 100644 --- a/web/cobrands/fixmybarangay/message_manager_client.js +++ b/web/cobrands/fixmybarangay/message_manager_client.js @@ -28,6 +28,13 @@ * * want_nice_msgs don't use language like "lock granted" * + * tooltips hash of tooltips: override the items you want, keys are: + * tt_hide, tt_info, tt_reply, tt_radio + * + * want_radio_btns normally MM clients show a radio button, but for archive + * messages this might be unneccessary: default is true, but + * pass in false to suppress this. + * * *_selector these are the jQuery selects that will be used to find * the respective elements: * @@ -63,7 +70,15 @@ var message_manager = (function() { var _mm_name = "Message Manager"; var _use_fancybox = true; // note: currently *must* have fancybox! var _want_nice_msgs = false; - + var _want_radio_btns = true; + + var _tooltips = { + tt_hide : "Hide message", + tt_info : "Get info", + tt_reply : "Send SMS reply", + tt_radio : "Select message before clicking on map to create report" + }; + // cached jQuery elements, populated by the (mandatory) call to config() var $message_list_element; var $status_element; @@ -82,12 +97,6 @@ var message_manager = (function() { var msg_lock_granted_ok = ["Lock granted OK", "Checking message... OK"]; var msg_lock_denied = ["", "Someone is working with that message right now!"]; - // tooltips currently hardcoded, but maybe hide if don't _want_nice_msgs? - var tooltip_hide = "Hide message"; - var tooltip_info = "Get info"; - var tooltip_reply = "Send SMS reply"; - var tooltip_radio = "Select message before clicking on map to create report"; - function get_msg(msg) { return msg[_want_nice_msgs? 1 : 0]; } @@ -127,6 +136,16 @@ var message_manager = (function() { if (typeof settings.want_nice_msgs !== 'undefined') { _want_nice_msgs = settings.want_nice_msgs; } + if (typeof settings.want_radio_btns !== 'undefined') { + _want_radio_btns = settings.want_radio_btns; + } + if (settings.tooltips) { + for (var key in settings.tooltips) { + if (settings.tooltips.hasOwnProperty(key)) { + _tooltips[key]=settings.tooltips[key]; + } + } + } } $message_list_element = $(selectors.message_list_selector); $status_element = $(selectors.status_selector); @@ -219,25 +238,26 @@ var message_manager = (function() { } }; - var extract_replies = function(replies, depth) { + var extract_replies = function(replies, depth, is_archive) { var $ul = ""; if (replies && replies.length > 0) { $ul = $('<ul class="mm-reply-thread"/>'); for (var i=0; i<replies.length; i++) { - $ul.append(get_message_li(replies[i], depth)); + $ul.append(get_message_li(replies[i], depth, is_archive)); } } return $ul; }; - var get_message_li = function(message_root, depth) { + var get_message_li = function(message_root, depth, is_archive) { var msg = message_root.Message; // or use label value var lockkeeper = message_root.Lockkeeper.username; var escaped_text = $('<div/>').text(msg.message).html(); var $p = $('<p/>'); - var $hide_button = $('<a class="mm-msg-action mm-hide" id="mm-hide-' + msg.id + '" href="#hide-form-container" title="' + tooltip_hide + '">X</a>'); - var $info_button = $('<span class="mm-msg-action mm-info" id="mm-info-' + msg.id + '" title="' + tooltip_info + '">i</span>'); - var $reply_button = $('<a class="mm-msg-action mm-rep" id="mm-rep-' + msg.id + '" href="#reply-form-container" title="' + tooltip_reply + '">reply</a>'); + var $hide_button = $('<a class="mm-msg-action mm-hide" id="mm-hide-' + msg.id + '" href="#hide-form-container" title="' + _tooltips.tt_hide + '">X</a>'); + var $info_button = $('<span class="mm-msg-action mm-info" id="mm-info-' + msg.id + '" title="' + _tooltips.tt_info + '">i</span>'); + var $reply_button = $('<a class="mm-msg-action mm-rep" id="mm-rep-' + msg.id + '" href="#reply-form-container" title="' + _tooltips.tt_reply + '">reply</a>'); + var is_radio_btn = _want_radio_btns && depth === 0 && ! is_archive; if (_use_fancybox) { $reply_button.fancybox(); $hide_button.fancybox(); @@ -245,16 +265,21 @@ var message_manager = (function() { if (depth === 0) { var tag = (!msg.tag || msg.tag === 'null')? ' ' : msg.tag; tag = $('<span class="msg-tag"/>').html(tag); - var radio = depth > 0? null : $('<input type="radio"/>').attr({ - 'id': 'mm_text_' + msg.id, - 'name': 'mm_text', - 'value': escaped_text, - 'title': tooltip_radio - }).wrap('<p/>').parent().html(); + var radio = null; + if (is_radio_btn) { + radio = $('<input type="radio"/>').attr({ + 'id': 'mm_text_' + msg.id, + 'name': 'mm_text', + 'value': escaped_text, + 'title': is_radio_btn? _tooltips.tt_radio : "" + }).wrap('<p/>').parent().html(); + } else { + radio = $("<p>–</p>").addClass('mm-radio-filler'); + } var label = $('<label />').attr({ 'class': 'msg-text', 'for': 'mm_text_' + msg.id, - 'title': tooltip_radio + 'title': is_radio_btn? _tooltips.tt_radio : "" }).text(escaped_text).wrap('<p/>').parent().html(); $p.append(tag).append(radio).append(label); } else { @@ -275,7 +300,7 @@ var message_manager = (function() { } $p.append('<div class="msg-info-box" id="msg-info-box-' + msg.id + '">' + info_text + '</div>'); if (message_root.children) { - $litem.append(extract_replies(message_root.children, depth+1)); + $litem.append(extract_replies(message_root.children, depth+1, is_archive)); } return $litem; }; @@ -303,7 +328,7 @@ var message_manager = (function() { if (archive instanceof Array) { var $arch_ul = $('<ul class="mm-root mm-archive"/>'); for(i=0; i< archive.length; i++) { - litem = get_message_li(archive[i], 0); + litem = get_message_li(archive[i], 0, true); $arch_ul.append(litem); } $output.append($arch_ul); @@ -316,7 +341,7 @@ var message_manager = (function() { $output.append('<p class="mm-empty">No messages available.</p>'); } else { for(i=0; i< messages.length; i++) { - litem = get_message_li(messages[i], 0); + litem = get_message_li(messages[i], 0, false); $ul.append(litem); } } diff --git a/web/cobrands/fixmystreet/_base.scss b/web/cobrands/fixmystreet/_base.scss index 189db4222..9f6a2fe90 100644 --- a/web/cobrands/fixmystreet/_base.scss +++ b/web/cobrands/fixmystreet/_base.scss @@ -1,7 +1,12 @@ /* HEADINGS and TYPOGRAPHY */ +$body-font: MuseoSans, Helmet, Freesans, sans-serif !default; +$meta-font: Helmet, Freesans, sans-serif !default; +$heading-font: 'Museo300-display', MuseoSans, Helmet, Freesans, sans-serif !default; +$image-sprite: '/cobrands/fixmystreet/images/sprite.png' !default; + body { - font-family: MuseoSans, Helmet, Freesans, sans-serif; + font-family: $body-font; margin:0; font-size:1em; line-height:1.5; @@ -17,14 +22,14 @@ p { } small{ - font-family: Helmet, Freesans, sans-serif; + font-family: $meta-font; font-style: italic; font-size: 0.8125em; line-height: 1.2307em; } h1 { - font-family: 'Museo300-display', MuseoSans, Helmet, Freesans, sans-serif; + font-family: $heading-font; font-size: 2em; line-height: 1em; font-weight: normal; @@ -40,7 +45,7 @@ h1#reports_heading a { } h2 { - font-family:'Museo300-display', MuseoSans, Helmet, Freesans, sans-serif; + font-family: $heading-font; font-size: 1.5em; /*24px*/ line-height: 1.3333em; /*32px*/ font-weight: normal; @@ -102,7 +107,7 @@ ol.big-numbers { color:#ccc; line-height:1; font: { - family: Helmet, Freesans, sans-serif; + family: $meta-font; weight:bold; size:2.5em; } @@ -188,14 +193,14 @@ a:visited { margin-bottom: 0px; } .meta-2{ - font-family: Helmet, Freesans, sans-serif; + font-family: $meta-font; color:#666666; font-style: italic; font-size: 0.75em; } h4.static{ - font-family: Helmet, Freesans, sans-serif; + font-family: $meta-font; text-transform: uppercase; font-size: 0.875em; line-height: 1.71428em; @@ -284,7 +289,7 @@ textarea { display: block; font-size: 1em; line-height: 1.5em; - font-family: Helmet, Freesans, sans-serif; + font-family: $meta-font; min-height:8em; } @@ -451,7 +456,7 @@ p.label-valid { background: url('/cobrands/fixmystreet/images/ie_logo.gif') 0 -5px no-repeat; } .ie7 #site-logo { - background: url('/cobrands/fixmystreet/images/sprite.png') -3px -3px no-repeat; + background: url($image-sprite) -3px -3px no-repeat; } // this is a skip to nav for mobile users only @@ -510,7 +515,7 @@ p.label-valid { background: url('/cobrands/fixmystreet/images/ie_mysoc_logo.gif') center no-repeat; } .ie7 #main-nav ul#mysoc-menu li a#mysoc-logo { - background: url('/cobrands/fixmystreet/images/sprite.png') -240px -38px no-repeat; + background: url($image-sprite) -240px -38px no-repeat; } //defines where the table caption is (login stuff on mob, nav menu on desktop) @@ -570,7 +575,7 @@ p.label-valid { text-transform:uppercase; font: { size:0.6875em; - family: Helmet, Freesans, sans-serif; + family: $meta-font; } &:hover, &.hover { text-decoration:none; @@ -578,11 +583,11 @@ p.label-valid { color:#fff; } &.abuse { - background-image:url('/cobrands/fixmystreet/images/sprite.png'); + background-image:url($image-sprite); background-position:center -2424px; } &.feed { - background-image:url('/cobrands/fixmystreet/images/sprite.png'); + background-image:url($image-sprite); background-position:center -2563px; } &.share { @@ -590,11 +595,11 @@ p.label-valid { background-position: center 25%; } &.chevron { - background-image:url('/cobrands/fixmystreet/images/sprite.png'); + background-image:url($image-sprite); background-position:center -2716px; } &.hover { - background-image:url('/cobrands/fixmystreet/images/sprite.png'); + background-image:url($image-sprite); background-position:center -2064px; } } @@ -740,7 +745,7 @@ a.button-right, :hover.button-right, a:hover.button-right { padding:1em 3em 1em 1em; - background-image: url('/cobrands/fixmystreet/images/sprite.png'); + background-image: url($image-sprite); background-repeat:no-repeat; background-position:right -686px; } @@ -750,7 +755,7 @@ a.button-left, :hover.button-left, a:hover.button-left { padding:1em 1em 1em 3em; - background-image: url('/cobrands/fixmystreet/images/sprite.png'); + background-image: url($image-sprite); background-repeat:no-repeat; background-position:-18px -802px; } @@ -759,7 +764,7 @@ a:hover.button-left { position: relative; z-index:1000; top:-1.75em; - background: $contrast1; + background: $col_click_map; color: #fff; padding:1em; text: { @@ -775,7 +780,7 @@ a:hover.button-left { width: 0; height: 0; border-left: 0.5em solid transparent; - border-bottom: 0.5em solid $contrast1_dark; + border-bottom: 0.5em solid $col_click_map_dark; } } @@ -809,9 +814,9 @@ a:hover.button-left { } &#fixed { color:#fff; - background: $contrast1; + background: $col_fixed_label; &:before { - border-bottom: 0.5em solid $contrast1_dark; + border-bottom: 0.5em solid $col_fixed_label_dark; } } } @@ -971,7 +976,7 @@ a:hover.button-left { width:20px; height:20px; opacity: 0.5; - background:#fff url(/cobrands/fixmystreet/images/sprite.png) -16px -1098px no-repeat; + background:#fff url($image-sprite) -16px -1098px no-repeat; //hide text - http://nicolasgallagher.com/another-css-image-replacement-technique/ font: 0/0 a; color: transparent; @@ -1035,7 +1040,7 @@ a:hover.button-left { height:36px !important; text-indent:-999999px; opacity:0.85; - background:url('/cobrands/fixmystreet/images/sprite.png') no-repeat; + background:url($image-sprite) no-repeat; &:hover { opacity:1; } @@ -1103,19 +1108,19 @@ a:hover.button-left { padding:0.6em 3em 0.5em 1em; background-repeat:no-repeat; &#hide_pins_link { - background-image:url('/cobrands/fixmystreet/images/sprite.png'); + background-image:url($image-sprite); background-position: right -3976px; } &#all_pins_link { - background-image:url('/cobrands/fixmystreet/images/sprite.png'); + background-image:url($image-sprite); background-position: right -4022px; } &#map_permalink { - background-image:url('/cobrands/fixmystreet/images/sprite.png'); + background-image:url($image-sprite); background-position: right -4070px; } &.feed { - background-image:url('/cobrands/fixmystreet/images/sprite.png'); + background-image:url($image-sprite); background-position: right -3936px; } &:hover { @@ -1182,7 +1187,7 @@ a:hover.button-left { height: 20px; padding-top: 30px; width: 4em; - background: #fff url('/cobrands/fixmystreet/images/sprite.png') 12px -4140px no-repeat; + background: #fff url($image-sprite) 12px -4140px no-repeat; color: #000; } } @@ -1366,10 +1371,10 @@ table.nicetable { width:16px; height:16px; text-indent:-999999px; - background:url(/cobrands/fixmystreet/images/sprite.png) -341px -263px no-repeat; + background:url($image-sprite) -341px -263px no-repeat; @include border-radius(4px); &:hover { - background:#222 url(/cobrands/fixmystreet/images/sprite.png) -341px -223px no-repeat; + background:#222 url($image-sprite) -341px -223px no-repeat; } } } @@ -1438,7 +1443,7 @@ table.nicetable { h2 { font: { style:italic; - family: Helmet, Freesans, sans-serif; + family: $meta-font; size:1.1875em; } color:#4d4d4d; @@ -1451,7 +1456,7 @@ table.nicetable { padding:1em; color: $primary_text; background: $primary; - font-family: Helmet, Freesans, sans-serif; + font-family: $meta-font; label { margin:0; } @@ -1493,7 +1498,7 @@ table.nicetable { color:#C8C8C8; padding:0.5em; font: { - family: Helmet, Freesans, sans-serif; + family: $meta-font; size:0.8125em; } @include border-radius(0 0 0.25em 0.25em); @@ -1510,7 +1515,7 @@ table.nicetable { width:100%; color: $primary_text; background: $primary; - font-family: Helmet, Freesans, sans-serif; + font-family: $meta-font; div { display:table-cell; text-align:center; diff --git a/web/cobrands/fixmystreet/_colours.scss b/web/cobrands/fixmystreet/_colours.scss index 1a62d0282..7dcd9ab9b 100644 --- a/web/cobrands/fixmystreet/_colours.scss +++ b/web/cobrands/fixmystreet/_colours.scss @@ -1,9 +1,13 @@ /* COLOURS */ $primary: #FFD000; -$primary_b: #F3B11E; +$primary_b: #F3B11E; // For the box around the front page postcode form only $primary_text: #222; -$contrast1: #00BD08; -$contrast1_dark: #4B8304; -$contrast2: #AA8D11; +// The "Click map" box on /around +$col_click_map: #00BD08; +$col_click_map_dark: #4B8304; + +// The "fixed" message on a report page +$col_fixed_label: #00BD08; +$col_fixed_label_dark: #4B8304; diff --git a/web/cobrands/fixmystreet/_layout.scss b/web/cobrands/fixmystreet/_layout.scss index 855e453b8..7a84af521 100644 --- a/web/cobrands/fixmystreet/_layout.scss +++ b/web/cobrands/fixmystreet/_layout.scss @@ -1,6 +1,8 @@ @import "compass"; @import "_mixins"; +$image-sprite: '/cobrands/fixmystreet/images/sprite.png' !default; + //hacks for desk/mob only stuff .desk-only { display: block; @@ -10,7 +12,8 @@ } body { - background: #1A1A1A url(/cobrands/fixmystreet/images/tile.jpg) 0 0 repeat; + background: #1A1A1A; + color: #fff; } h1 { @@ -54,17 +57,16 @@ h1 { } } -.nav-wrapper{ +.nav-wrapper { display: table-caption; - .nav-wrapper-2{ + .nav-wrapper-2 { width: 100%; min-height: 4em; position: absolute; - border-top:4px solid #1a1a1a; - @include border-image(url(/cobrands/fixmystreet/images/tile-y-border.jpg) 4 0 0 0); - border-left:0; - border-right:0; - z-index:2; + border-top: 4px solid $primary; + border-left: 0; + border-right: 0; + z-index: 2; } } @@ -151,7 +153,6 @@ h1 { background: $primary; padding:0.25em; margin:0.5em; - color:#333; @include border-radius(0.25em); &:hover { background:$primary/1.1; @@ -165,12 +166,12 @@ h1 { &#mysoc-menu{ padding: 0em 0.5em; margin-left: 0.25em; - background:$primary url(/cobrands/fixmystreet/images/tile-y.jpg); + background: $primary; @include border-radius(0 0 0.375em 0.375em); li{ a{ background:none; - color:#000; + color: $primary_text; text-transform: uppercase; font-size: 0.6875em; padding: 1.3em 0.7em 1em 0.7em; @@ -203,8 +204,9 @@ h1 { margin-top: 3em; margin-bottom: -1em; margin-left: 0.5em; - padding: 1em 1em 10em; + padding: 1em 1em 3em; background: #fff; + color: #222; @include box-shadow(0px 0px 6px 1px #000); } .ie6, .ie7, .ie8 { @@ -223,6 +225,7 @@ body.mappage { } .content { float:left; + padding: 1em 1em 10em; } #main-nav ul#main-menu li a, #main-nav ul#main-menu li span { @@ -374,7 +377,7 @@ body.twothirdswidthpage { //footer blocks #footer-mobileapps { - border-right:1em solid #fff; + border-right:1em solid transparent; background:none; padding:0; @include box-shadow(inset rgba(0, 0, 0, 0) 0 0 0); @@ -395,7 +398,7 @@ body.twothirdswidthpage { height: 32px; margin:0 auto; text-indent: -999999px; - background: url(/cobrands/fixmystreet/images/sprite.png) -12px -3610px no-repeat; + background: url($image-sprite) -12px -3610px no-repeat; opacity: 0.8; &:hover { opacity: 1; @@ -432,14 +435,14 @@ body.twothirdswidthpage { } #footer-help { - border-left:1em solid #fff; + border-left:1em solid transparent; ul { display:table; li { display:table-cell; border-bottom:none; &:last-child { - border-left:1.25em solid #fff; + border-left:1.25em solid transparent; } } } @@ -502,7 +505,7 @@ body.twothirdswidthpage { left:-1em; width:1em; height:100%; - background:#000 url(/cobrands/fixmystreet/images/sprite.png) right -4119px no-repeat; + background:#000 url($image-sprite) right -4119px no-repeat; @include border-radius(0.25em 0 0 0.25em); &:hover { left:-1.5em; @@ -582,11 +585,11 @@ body.twothirdswidthpage { padding: 0.5em 1.5em 0.5em 0; text-transform:none; &.abuse { - background-image:url(/cobrands/fixmystreet/images/sprite.png); + background-image:url($image-sprite); background-position:right -2935px; } &.feed { - background-image:url(/cobrands/fixmystreet/images/sprite.png); + background-image:url($image-sprite); background-position:right -3074px; } &.share { @@ -595,11 +598,11 @@ body.twothirdswidthpage { background-position: 90% 50%; } &.chevron { - background-image:url(/cobrands/fixmystreet/images/sprite.png); + background-image:url($image-sprite); background-position:right -3225px; } &.hover { - background-image:url(/cobrands/fixmystreet/images/sprite.png); + background-image:url($image-sprite); background-position:right -1876px; } } @@ -639,14 +642,14 @@ body.twothirdswidthpage { margin-left:-2em; font-size:1.375em; padding:1em 3em 1em 1em; - background: $contrast1 url(/cobrands/fixmystreet/images/sprite.png) right -2188px no-repeat; + background: $col_click_map url($image-sprite) right -2188px no-repeat; &:before { right:0; left:auto; top:-0.5em; position: absolute; border-top: 0.5em solid transparent; - border-left: 0.5em solid $contrast1_dark; + border-left: 0.5em solid $col_click_map_dark; border-bottom:none; } span { @@ -656,7 +659,7 @@ body.twothirdswidthpage { } } .ie6 .big-green-banner { - background: $contrast1 url(/cobrands/fixmystreet/images/ie_green_chevron.gif) right center no-repeat; + background: $col_click_map url(/cobrands/fixmystreet/images/ie_green_chevron.gif) right center no-repeat; } .banner { @@ -671,11 +674,11 @@ body.twothirdswidthpage { } &#fixed { padding-top:5em; - background-image:url(/cobrands/fixmystreet/images/sprite.png); + background-image:url($image-sprite); background-position:-324px -326px; background-repeat:no-repeat; &:before { - border-bottom: 0.75em solid $contrast1_dark; + border-bottom: 0.75em solid $col_fixed_label_dark; } } } @@ -798,7 +801,7 @@ body.frontpage { top:3em; width: 300px; height: 60px; - background: url('/cobrands/fixmystreet/images/sprite.png') -2px -108px no-repeat; + background: url($image-sprite) -2px -108px no-repeat; } #user-meta { z-index:10; @@ -848,7 +851,7 @@ body.frontpage { // big yellow bit full screen width #front-main { color: $primary_text; - background: $primary url(/cobrands/fixmystreet/images/tile-y.jpg); + background: $primary; margin: 0; padding: 1em; #front-main-container { @@ -858,9 +861,10 @@ body.frontpage { h2 { font-style:normal; margin:0; - color:#222; + color: inherit; } #postcodeForm { + color: inherit; background:none; overflow:hidden; padding-bottom: 0; @@ -890,15 +894,15 @@ body.frontpage { } } a { - color: $primary_text; + color: inherit; text-decoration: underline; &:hover { text-decoration: none; } } a#geolocate_link { + color: inherit; background:none; - color:#222; text-decoration: none; padding-bottom: 0; &:hover { @@ -919,7 +923,7 @@ body.frontpage { } #front-howto { - border-right:1em solid #fff; + border-right:1em solid transparent; #front_stats { background:none; color: #222; @@ -943,7 +947,7 @@ body.frontpage { } #front-recently { - border-left:1em solid #fff; + border-left:1em solid transparent; } #front-howto h2, diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 33da2a2d0..ab20520d0 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -123,6 +123,7 @@ $(function(){ } if (! is_small_map) { $('#site-header').show(); + banner_text = validation_strings.report_problem_heading; } $('#fms_pan_zoom').css({ top: '4.75em !important' }); $('.big-green-banner') @@ -438,7 +439,7 @@ $.fn.drawer = function(id, ajax) { */ if (!$('html.mobile').length) { if (!($('body').hasClass('frontpage'))){ - var offset = -176; + var offset = -18 * 16; if (cobrand == 'bromley') { offset = -110; } diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index ff7080c11..a20a4b889 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -66,3 +66,24 @@ h3, h4 { @import "_colours"; @import "_layout"; +// Tiled main body background +body { + background: #1A1A1A url(/cobrands/fixmystreet/images/tile.jpg) 0 0 repeat; + color: #fff; +} + +// Tiled background stripe, not plain colour +#front-main { + background: $primary url(/cobrands/fixmystreet/images/tile-y.jpg); +} +#main-nav { + ul#mysoc-menu { + background: $primary url(/cobrands/fixmystreet/images/tile-y.jpg); + } +} +.nav-wrapper { + .nav-wrapper-2 { + @include border-image(url(/cobrands/fixmystreet/images/tile-y-border.jpg) 4 0 0 0); + } +} + diff --git a/web/cobrands/stevenage/_colours.scss b/web/cobrands/stevenage/_colours.scss index 72027c302..219f1066a 100644 --- a/web/cobrands/stevenage/_colours.scss +++ b/web/cobrands/stevenage/_colours.scss @@ -2,9 +2,10 @@ $primary: #066539; -$primary_b: lighten($primary, 20%); -$primary_text: #333; +$primary_b: $primary; +$primary_text: #fff; -$contrast1: #00BD08; -$contrast1_dark: #4B8304; -$contrast2: #AA8D11; +$col_click_map: #00BD08; +$col_click_map_dark: #4B8304; +$col_fixed_label: #00BD08; +$col_fixed_label_dark: #4B8304; diff --git a/web/cobrands/stevenage/_fmsbase.scss b/web/cobrands/stevenage/_fmsbase.scss deleted file mode 100644 index 79481250d..000000000 --- a/web/cobrands/stevenage/_fmsbase.scss +++ /dev/null @@ -1,1537 +0,0 @@ -/* HEADINGS and TYPOGRAPHY */ - -body { - font-family: 'PTSansRegular',PT Sans,Verdana,Arial,Sans-Serif; - margin:0; - font-size:1em; - line-height:1.5; - color: #222; - background-color: #fff; -} - - -p { - font-size: 1em; - font-weight: normal; - margin:0 0 1em 0; -} - -small{ - font-family: 'PTSansRegular',PT Sans,Verdana,Arial,Sans-Serif; - font-style: italic; - font-size: 0.8125em; - line-height: 1.2307em; -} - -h1 { - font-family: 'PTSansCaptionRegular', PT Sans Caption, Verdana, Arial, Sans-Serif; - font-size: 2em; - line-height: 1em; - font-weight: normal; - margin-top: 0.5em; - margin-bottom: 0.5em; -} -h1#reports_heading span { - display: none; -} -h1#reports_heading a { - display: block; - font-size: 50%; -} - -h2 { - font-family: 'PTSansCaptionRegular', PT Sans Caption, Verdana, Arial, Sans-Serif; - font-size: 1.5em; /*24px*/ - line-height: 1.3333em; /*32px*/ - font-weight: normal; - margin-top: 1.333333333em; /*32px*/ - margin-bottom: 0.666666666em; /*16px*/ -} - -h3 { - font-size: 1.25em; - line-height: 1.20em; - margin-top: 1.2em; - margin-bottom: 0.8em; - font-weight: normal; -} - -h4 { - font-size: 1em; - font-weight: normal; - margin-bottom: 1em; -} - -// default list styles -ul, ol { - font-size: 1em; - margin-bottom: 2em; - margin-left: 2em; - padding:0; -} - -li{ - margin-bottom: 0.5em; -} - -ul li{ - list-style: square; -} - -ol li { - list-style:decimal; -} - -// lets you have a traditional ol but with nicely styled numbers -// for older browsers it just falls back to the normal ol -ol.big-numbers { - padding: 0; - margin: 0; - counter-reset: li; // reset counter to be 'li' instead of a number - > li { - position: relative; - list-style: none; - padding:0 0 0 2.5em; - margin-bottom:2em; - &:before { - content: counter(li); // set the content to be whatever the 'li' var is - counter-increment: li; // add to the counter var - position: absolute; - left: 0; - top:-0.2em; - color:#ccc; - line-height:1; - font: { - font-family: 'PTSansRegular',PT Sans,Verdana,Arial,Sans-Serif; - weight:bold; - size:2.5em; - } - } - } -} - -dl { - margin: 0; - padding: 0; - dt { - font-size: 1em; - line-height: 1.5em; - font-weight: bold; - } - dd { - font-weight: 1em; - line-height: 1.5em; - margin:0 0 1em 0; - } -} - -blockquote { - p:before { - content: '“'; - } - p:after { - content: '”'; - } -} - -pre { - font-family: monospace; -} - -img { - //do this otherwise IE will just not display - //any img without a height defined - height:auto; - max-width: 100%; -} -// So that map popups display correctly -#popup img { - max-width: none; -} - -select, input, textarea { - font-size: 99%; - max-width: 95%; -} -.ie7 { - select, input, textarea { - max-width: none; - } -} - -// To deal with bug from drop-down being wider than holder -select { - width: 100%; -} - -// links -a, -a:visited { - text-decoration:none; - color:#0BA7D1; - &:hover, - &:active { - text-decoration:underline; - color:#0D7CCE; - } -} - -// custom type -.small-print { - @extend small; - margin-bottom: 1.2307em; - color:#666666; -} -.meta{ - color:#555555; - font-style: italic; - margin-bottom: 0px; -} -.meta-2{ - font-family: 'PTSansRegular',PT Sans,Verdana,Arial,Sans-Serif; - color:#666666; - font-style: italic; - font-size: 0.75em; -} - -h4.static{ - font-family: 'PTSansRegular',PT Sans,Verdana,Arial,Sans-Serif; - text-transform: uppercase; - font-size: 0.875em; - line-height: 1.71428em; - color:#666; - margin-top: 2em; -} -h4.static-with-rule{ - @extend.static; - background: #f6f6f6; - border-top: 0.25em solid $primary; - margin-bottom:0.25em; - padding: 0.5em 1em; -} - -/* FORMS */ - -// input placeholders, these need to be on separate lines as if the browser -// can't understand a selector it will invalidate the whole line. -::-webkit-input-placeholder { - color: #666666; - font: { - style:italic; - size:0.9375em; - } -} -:-moz-placeholder { - color:#666666; - font: { - style:italic; - size:0.9375em; - } -} -:-ms-placeholder { - color:#666666; - font: { - style:italic; - size:0.9375em; - } -} -//this only gets used when the browser doesn't support @placeholder -.placeholder { - color:#666666; - font: { - style:italic; - size:0.9375em; - } -} - -// wrap anything inside the form in a fieldset to give -// us the right spacing -fieldset { - margin: 1em; -} - -input[type=text], -input[type=password], -input[type=email], -input[type=file], -textarea { - @include box-sizing(border-box); - width: 100%; - // adjust so the sides line up - padding: 0.5em; -} -.ie7 { - input[type=text], - input[type=password], - input[type=email], - input[type=file], - textarea { - max-width: 95%; - } - // In order to work around the IE7 specific issue of inheriting left margins - // http://techblog.willshouse.com/2009/07/12/ie6ie7-form-element-margin-inheritance-bug/ - fieldset > input[type=text], - fieldset > input[type=password], - fieldset > input[type=email], - fieldset > textarea { - margin-left: -1em; - } -} - -textarea { - border: 0.125em solid #888888; - @include border-radius(0.25em); - display: block; - font-size: 1em; - line-height: 1.5em; - font-family: 'PTSansRegular',PT Sans,Verdana,Arial,Sans-Serif; - min-height:8em; -} - -input[type=text], -input[type=password], -input[type=email], -input[type=file] { - border: 0.125em solid #888888; - @include border-radius(0.25em); - display: block; - font-size: 1em; - line-height: 1em; -} -input[type=file] { - margin-bottom:1em; -} - -label{ - display: block; - margin-top: 1.25em; - margin-bottom: 0.25em; - font-weight: bold; - &.inline{ - display: inline; - padding: 0 2em 0 1em; - font-weight: normal; - } -} - -// grey background, full width box -.form-box { - margin: 0 -2em 0.25em -2em; - background:#eeeeee; - padding:1em 2em 1em 2em; - >input[type=text] { - margin-bottom:1em; - } - .title { - font-size:1.25em; - margin:0.5em 0; - } - h5 { - margin:0 0 1em; - font: { - size:1.125em; - weight:normal; - } - strong { - font-size:2em; - margin-right:0.25em; - } - } -} -// IE6 doesn't extend the grey box back with the above negative margins, and -// the password box falls off screen for some reason. Just have boring margins, -// it looks okay. -.ie6 .form-box { - margin: 0 0 0.25em 0; - padding: 1em; -} -// Prevent grey displaying oddly by giving it a width, and stop odd left margin issue -.ie7 .form-box { - width: 100%; - > input[type=text] { - margin-left: 2em; - } -} - -.form-txt-submit-box { - min-height:3em; - input[type=password], - input[type=text], - input[type=email] { - width: 65%; - float:left; - } - input[type=submit] { - float:right; - width:28%; - margin-right:0.25em; - padding-top:0.7em; - padding-bottom:0.6em; - } -} - -.checkbox-group { - margin:1em 0; -} - - -// form errors -div.form-error, -p.form-error { - @include inline-block; - background:#ff0000; - color:#fff; - padding:0 0.5em; - @include border-radius(0.25em 0.25em 0 0); - a { - color: white; - text-decoration: underline; - } - a:hover { - text-decoration: none; - } -} - -input.form-error, -textarea.form-error { - border-color:#ff0000; - @include border-radius(0 0.25em 0.25em 0.25em); -} - -ul.error { - background:#ff0000; - color:#fff; - padding:0 0.5em; - @include border-radius(0.25em); -} - -// don't display valid error boxes as now the page jump -// won't be until the user submits, which is fine -div.label-valid, -p.label-valid { - display:none !important; - visibility: hidden; -} - - - -/*** LAYOUT ***/ - -// Padding creates page margins on mobile -.container{ - padding: 0 1em 1em; -} - -// Use full width to reverse .container margins -.full-width { - margin: 0 -1em; -} - -// #site-header creates grey bar in mobile -// .nav-wrapper-2 is used on desktop -#site-header{ - border-top: 0.25em solid $primary; - height: 3em; - @include background(linear-gradient(#000, #222 10%, #222 90%, #000)); - .container { - min-height:4em; - } -} -#site-logo{ - display: block; - width: 175px; - height: 40px; - top: 0.4em; - background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAK8AAAAoCAYAAACIJ6oVAAAACW9GRnMAAAADAAAAAwB3k5ejAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAF5AAAQZgCwCYXlAAAABmJLR0QA/wD/AP+gvaeTAAAag0lEQVR42u1cB1RWx7YeBBW7YAOViL0bNSomdsWADVsQbEHFiAUUMYmiokEUWzQiiQ0VNSC2gFiJmthbiF1jwxaNGr0pKra8t1be3r/frLc99/zwo7nv3rzFWWuv/z9zZs6ZM/PtPd/eM3OUyj1yj9wj98g9co/cI/fIPXKP3MPaYQfJY6Po/LlH7vFvBa09ST6SIiROJM7ZiBPy5kPZXBDnHv8W0OYHGCuSeJB4kniReFsRL+TxQBkngDhPbpPmHv8XRx4AjoFXiaQFSUDXrl2XxMfHp585c+b2nyZHZmbmM742b968gx4eHvO5DElzkgokhXKtcO7xrz7sAbQKAF7AoEGDEk+ePPnznzk8tm3bdhUg7kFSE5QiJ1bY7jXkrxyB/pX5/4o2yD0EcKuQdHdzc5t14MCBm3++5rFy5cqjdL9AKMMbJAWzAbB0DLlODlmIPeSvdBrNnFNr97LmyL4OsOQ97bNoA/nuf1eA/yX1zCOA69uxY8eEhw8f/mEGxrt37z5OS0vLWLZs2QmS4yzr168/d/Xq1V+sAfjKlSu/kjLMpHv7AMD5TCprJ7h2XvDtAqgXS2EhOq0g8jgiv5Z8ooNtbRj5fAfcI5+VexkBlhf5XvXZRsXVz3fEOxrbQL+7I/LlNVFio2Lb/YeBNqt62uXkRvlAFboDuP9lQgOudenSZRmsqI+Js+bj6en58erVq/cT/31uLH/p0qUHAHALUAj7LJzEQuDcpUlcScqRlBfC52VJypCUElEOluIkRdG5OYl4GJ9fVNyrENKlpcsD0DgiulIczy+G/DmNtkjFLYj7lCRxsfL+Lnh3JwC6gEGBHYVS531FZfpXWVppoMzqabOy2aMBmjNHNVrcCxcuPPL29l4D0LYkqQzQlICUhJSB5W5ZtWrV4KNHj14xs8C4T010cB4rIbkycBbrkLyF6EVTIU1IGpHUJ6lFUg31qowoR3nUqbCNIJLALQqleQP3egPnRXHdwQAyZ4CpEp5fAfmLCMDb2QjcfKgzg9Id79YQ7/82yTv49UC71EWblxdALo46lUT/FLeifLZSjFelIXZZjFTaQBQX+HFGGxdA22YLYDvciBs+4NSpUy85ZhcvXnxUtmzZhXTNTzhdjrh5ATxMx3eLocNKIK9fbGzsXiOAU1JSTsKJqyDogx1AUQgdX33RRDX84EqV8G2cWrdzkfpqx0KVzML/dy5WX1H6+n3LVdKsUPUR5W/DFn3BeBV8ap2KS5hmUZBK6NBC2TSGUXHY0tc4s0EtObFWLW3R0HLvGkgvIqhBQbwrP6dB0gwVfixJLY+brIYivwuAmF1H2IkITxGU4/LvvPnmm73IZ1hAo9axe/fu3dBtyP8vX76cnpSUFPPWW291pbyNAXStwNXQBzWggC7oH0dh3ewNw7Y138HeRPKYgNnOCl+3N3B3R9TFBW3H9ayNOruhTQvZAmBtdVtOnz59i9HiAri+JFVFRxhjv+1I2nIHwmLqYZTL+JoBGFGI5riPvei8orB0jffHq9V/nlR/2iLV3dUQKtNrz1K1ls/TE9UKWGU3aLcjGi6PlUbOJxWHFUHfmxUEI051XC8M4DrBOjauV035PU9XmSJ/M1jEElByBxM+Z2diccsAhG0GDx4c/vTp0yfZOcTPnj17PGnSpEjE2LmeLVJTU2fytT/++OPR2rVrxwIc5dAWBcVQbSb5BdfXfkdBIVnxbAcDHSggRPP34qhL7QEDBrz3+PHju1xXUsY0KGEVWOKCot2scl0GYYDkqcx5GzZsuAoWVwL3pTAaNfCqmJiY/dOmTdtepUqVkRjGCgsrymX9jBSCoxiIA1cUw1l+vJgltuzdTI0a5quWaBD17ahS+3dWyQFd1PoAH7V2YFeV9Mte9RtfG9lbxVKZYUsi1PKbX6sf1sxU8zDEVhVDfgHhTDkYnKLCAFpF0BJf/dzf96t/QIGbAqzOqCdb4noknbZ+rjbr/Fti1Rb4BA0wnBcXzzZyZiNVYOvTysvLa/QTOnIS1RkzZswcKtufhQGt02/dunUOxqUOlLm0GKpL4rlaSor3K442KQUr6WrCsx0NQC8oRuNSUMYy4t6l0CZcl3a7du3aIN/Bx8cnCLSokhjlTWlXHjyo6cyZM1PlTRYvXnxWcFMJXEsYjfNLsGdkZPzm7u4+AR1WWHQM/6/JjpzRiYP19YCV1p1YHABi5ehHMlGDgv4vImFQstMXTTLtYqq6xtdG+CkeIUJJRpAMIunJIEAjVUCjlxDOV0HhlDmjgSvAWncK7afmScv+ebj6ktOhnOVxvyp6AufXfS+UiOXgCnUcINLWuhyeXUTwOQfh7GmOXVkrzqFDh743gvO77777nQzFtfnz51/ZvXv3P8Xdjx07dpHKch9EyHTqmwy0ZRu8n6YTtdA+daGEdZFWHe9WFXnrgXc3wm8dXC8HQBaDOKNdKkAJ6+J59fFfP/dNKFP/DRs27JJ1DQkJ+ZzxBT5fDm2W18z62kMTOh0+fPiatLrly5efi8Z3FhaKh/NuNCQdN/Dih+XKlfuCrnVFHkcxdORHx7XcsmXLd7Icz8RhKtlJOEBFAI5GAOAYAd5Z3DEkYSRs5UcBsKMgnBZM8gFGjHehHPXQcFVQP1eA1RXnVdBpDdDB/Yf0VMv5mZmH1XP+ZQtP6e8DrDVQhvN3mT/2Bb3ReS9sVDcofTjA7mHo7BIiMqCpRzncsyksdsiNGzfuybaaM2fObUrn9tpFso1kO1naMzIP9eF1Sud+WCTTf/jhBx7lPibpizq9O3r06BHdu3dn49SN/Y8uXboMjYyMjECaN/qlPeevXbt2/wkTJkSNHz9+6sSJE6d07dr1A1xvjHatiBGpGoDavH79+j2nTJkykekMCyxqJ1CbzlDu8BUrVqTLugYEBKxD27VHm5REW9mbOWqs7YPkDQhk12F1KyNPHoCqyZAhQ5YbeHEm8eI4QS+KoHNc8ELa4lRh6yvL8lQyGspZEPoCsEK1AL4PBHiZuzG37Q1g98RzuSEGX9umLl3dqi6nr1aH331bjYFT6H1vtzpJVOJAYrTFKjUBmGvDAniwk8V5yNFLpvP3GDxMS/iZqTHq1t1v1GP+/8lQtRwK2hSWgYH+/i+wultj1XX+/SFFMVj4+X1C+6pgvvf5FLUWHasjNU5oG1aeeuMDVeC5ZPXt9e2KrecUo1Ul0Nyi9H0kTEk2QFK++OKLi3rka9u27ba4uLhT1mjF7du3f2Jg7N279xudRqBMSEtLO2Ri/UIqVqw4jhTie7N7Xbt27RJhYSzA2Bwc35OBfvz48QNWYv0Z/v7+bIBC33777bnEdZ+Z5SO29DQiIiISylFeWN+XwMuJHrxmwVD5HdCSUoKjcWN7Hjly5KoB6GxlhsG6FMMQyB3Uvm7dur0BwqLoMJ+ff/75kVwLIcCrCb/kvdwofQV4QxgQJB0x7LSBBejC6XKY3xRjsU4DjenEoT/Eu/FzO++Gg8fCXBlKGx7zsdrPafR7Lay/Osv/iaKwUg+G5eBO8x3ZR8XytZ+/VY/oPJn/39+jHtD/8axo4YFqmr7/jkUW2uMhvGp3KJDn5c0qXbxnjNl0/DfffHM/Ojr6LLXrJsqTSLKahEOYrBjsJGY7jc90S57L/tDH8uXLvyfOvd4auCTIevfuPR2+S0CbNm0mZOdg8j3p3mup3Las8q2hg+7ZGlgqjpH/Jb5rAWTfvn1TDaQ5DtalqAAVA8ybAWcSt+0HE18WYPWdPXt2CvG2Y2JCgs1/B+OiHhPwaurgho7uJTo1FEO3D0DbCuIFCxw8O+wFgDZ8qr4BleCw1fBdi9VeTv9tv/oFvHhonw7UkZT29Kh60ruDmg6rzkNWRPwU9T3Ay4DdTdY3E+BfAgBzPYZf2vSCc48frA7R+TpR14mgMcNH9VHzOe3BQXUfitZU8MG27Jjy9SdH1dNypVUMpS0MDw8/klXn3r17N5PXjgwdOnQv5Wc+vpLF19f3W+K+L810Mg08ceLEPZ4JpTyLs7rvo0eP/qhVq9aeS5cuPZTp5PQ9Jyucyb8y/dy5czwicNtFG6kO5X1Gxu4R0ZYnxsmqUqVK7SJl/IfxfkxB2UBWqlTpI1CHqsBpfiN4LYAkLdhqANRwkHZHEX8tExwcHGpFm9nK9AJ/GkpcZ6fgWu2FV+vNDZgFePWzCoMHNpZeP1mnK0wN2ELe3qXOkLU7xUMy7sHgHTm4u1rFedfMVNypH4EDM4gnEhe1DOuJ09UBOp9B97nL53GTLVZ6NMDLYJ+wYor6jq9FjVAXmGdGh6gzfL47TrEjO4mt8wc91ApOozo8BHhWCfBGCD4+lhy6Xzn9owEW3t4FSsejhy+PEnxtzzJ1hs4/ZctLsiwxMTHDligDWc9MomSpXAZA3iyvp6en/waawbQn3lj+/Pnzj4lrniOjdYKu7xk1atRlQ2TomZOTE1M8ph03k5KSXrLWrVu33kUU4qBMO3v2LJfhUZkxcHP16tUvlSHacJrSj82aNeu+TO/Wrdt3lB6LfmiTleW1Bbw6YlCLONV4s8a7fPny79u3b88g/nRw+vTppw2TEZ5iFs57xIgRu3II3l7ZxXhxDw5lhQQCvEkzLPyQKUIQGiK8UW21+PER9Yyvpy1Qly38NNnSuJPxzv0wBH6Ynqgy+HqPdhagby7trLZoh6xBDZVAaZ+TNb/A58sjFY8wbJEXE2e9z2lvuKhpAC5TnbEzQ9VGTj+9wQLQQeDWrPBBGtidW6p4Op9KEgUQx/fo0eMQ04XsAMyRnPbt26dwGZL1higEh/o47LmAJM5YFqBlLr2RncHk5OS78vrmzZufR0VFPWGZOnXqk4SEhKfyOjlkNzZs2HDfUOYZ5X3M+Vm+/PLLpyYO6AkC70vWumfPnvvZsMCPaYoR+J84r1Xa4OHhEYuCxcRkgx87ZmZrHqwd48aNW4uhX8/RdyAivs8G8BYCBWkkLS/9j4Q11U6bDyy7J8Irwwf3UCuF5R2l4574P2POGHVU34/B2LCmZTIjHKDtBiUI5ogB5+n1rtoJbpm0eOIL7rv1c3WtbhW1Rd/DtaQFMBz2m8fOGqcHvWexgiOhOKPdXNT0J0fUU77WvIFlmGXqEhwx5IWy/UijADtqJOPwjmy5OeLD9UvhYXbAgAFn4uPjf6LDlIsePHjwBqxvgkwnHnwPwGWFiDUZOdkqL0UoMsFIO7I7ZsyY8Ss9O0cxaQIvW/H0Tz/99I5M79Wr1y5Qru5wrMsgKmNvk8M2cuTINPDI8rDAvjzTxjNutlbu9OnTd8ELK+LhFodt3bp1P2ThsJmBt6ch2sBg8IfT1RoTEc1wPuSDnjQsUt61s9QeWNNeiEow4KM8PdQmfT/msRiixiCfFxTiA81l+3VSKTr85FJCJT06pJ6T/EFD/U1QjpMY5hmQM86nqB85fUhPC6BDYGXZoR2/ef4Lpwy0hYE65ViSushp00daLN8ETTWaNWs2kxc4YaIoHg7aWljHHdWrVz9u5JIAIoN3hUw7deoU98VnHBdnhTApswD14RFoHoM9J0D8+OOPf2NqkZMykydPvkrP2j937txbMt3f3387RswOwF4JEfHKPlTGAINlY1D4M3B5jYOtFeOlke7u7hGYKXECeDnOGZiRkfG7lVCZGXg5IN5NgDcIw20bALsO4oz1YX0H6fgswDsM+bshijDl6lb1C19/SADk35VR6qgBvMxHA/VQjg7/BMP5fLrveWm5yeouxzUG3ifMW/nauEGWKEAwrD5b9dAmddQXfI2pCysD0w9xPgWdFtKiRYso2Z59+vTZzJQEws9bzzy8Y8eOF02A+E+8FuCdBwX7zKTMVCgajwafkOF5yRrSkK8pQCZ+Lf+jo6MfBgUFsRN6hSzvU0OZ56JM5rRp0zj/A+a4zKlpJGGHOi0mJua6LMdRCPSHF6IyzmbgtTpJwR4nhugxrq6uy2y1uBwGWbNmzV6yCkMBXBfEbS2TFLycMotJCiN4XTEJ4CPA2xtOTj1YdL1MsBomVAJouF4qwDsCjhxTgSCmEnzt+Br1j5qV1F62onze09NiOd8XtCFIPPMjPcTzcEY0I15f+2qOhb9OR2NbuO3qGS9CbKAtwXj+e1CeieeS1S2+Hh6ojiyJeAH01HmWGTkdnQg2zjoxn61fv34SLORCOGXbiGteN+aD5V1mQhsWA8ALTcA7DgrGijaGOO9LsWIC3iM4axxZuEWO2E9jx479NTw8nO/LjteJuLi4+4YyPKrdRpmbVOZHzk+08UcGLRRwQ2xsbIbB8qahPp0RuSopfC/bpod59oa0Ywd5opnWwMr8t1+/filhYWFzQkJCRoF/yo2XeoEOW8dAXg+cxfSwnQl4LVO1AkjdkF+vFtNz7+5Qlr5Dfckh+V/wcARhAIufl5oFa/msThW1lWOys0LVMU67tUPdAfgGIgw2WjxT0xRfXP+IhvjNidHqYNN6lqF4JIDPMlIriADve6A0DOLRYf1VKl/fu0zdvoPJD3YkoQD87KE8cWDmkPEGgKVLl57kqXuz6WFymq+Cty42hr849IaIRKIJeEdj5OFJnaCBAwcmGfOQI/5b48aNf/Lz87vLkQSdHhkZeZnK7CSak25WpnLlyjepzB1ZhrB2AkoWv3DhwvPGrWODBw9eWbNmzYGYCHIFHhyyXJjDIRd9kwcPHvy3fKAZcDt06JCITqklZo2KiEXFhbWzxyDPYmGO2bJIF1hYbwGkjrDG5eAE6kUgOjLhN9xPLcJs11FwZLaaI27vVD9x+vyxlijEIkQHFmlLuG62+panUJvVVzPIKiZx2u1dFqsRAP7VGjN+vrCiQbjWA9d55m3wp2HqK1j3C6P6Wix6Tyh1Z0xbR/OEhn6nQ6ssceRIMaXNEY8xHGbMCYdkgMI68+Kcz+7du2c6WrZq1Wq3CXiHgy55QVF5Zu26Lc/FGhgOE65OSEi4aksZcjq/Rz1jrM0IkqJuxCSVO/o4b46WRNoAXLlU0sGwLE4D1+LsGaMU7CQalkQqAd6CmCLmKdx2ArztkFZGLK4uhHOeqeqqJwREmbCNn6k0/n8pVV0Dt5wEbz6SeaiOAnRppZbqYZ+Fp5phkVpAkd6E5W+NurTCeSP89wv2f8FrxfN7gKO3BzAj5n6oDuvroX0tjloYLHR7WGm2Op8QfThrS3/cuXPncfv27ZOxWIlj7pM2btx43Cxvy5Yt93F+fX7z5s07GJ084fwygAe5ubnNJh77Y3a+TaNGjZYitMfPXrB169ZrWZUhpXrYpEmTzxHhmUQOabzZrhu6z2a0sekkhU2L0c2A6+XltQ4aWh2W1sGwQt5ZL0Y3c/asLEaXi8IdQQe44m8f+VKtYgE1qCrWyOYTnLo6+PD7q6aq5OS5ageDlukATwIQr9zu722ZIBgq+B0P06ETBqsEGub3MB0Y1E0lcoyYZ+j6d7YAvROsvd6dUQHOZzWxa6MygM0dP2DlVJWS8pn6evsXKhUWWYPdYtW83nkxJY3JjSkAT1sMk01gyblukQ0aNEhYsmTJaZ4h41k1uYpv//79t4hiHECYbiIc1AGIrIyLior6+tChQze4T3mkGzZsGFOZhHbt2m2h9Ovp6emXaUifjb7wELtWvDESRJGzuIWfw7F8rSh8v8mTJ+/mDbqgTYNQX6Y+M8jp2sIgNpYhH+cAlZmB0VDXM5wNIQcJOA878VT2KO/EQZtkCd5stwFJKsGai0o2Ewu9C8O0l0JHsvMUyFuHbt++/dTGbUByR0F+0AI3TKN6QOoirZjYjqMXsLshOuENkASAh/bDaqo+GCk6wRK2BA14D40fgvf6EJZwCIb8ZmJNcHE828mwZ64UQNwI1KYPnu2H83aoF9dlPCnVCQZv7DiLUxkm1v7qXRD1Ubf3cT0SK+rmCJmNSMh4gMEfz2gL8PfGO0UgX7SYAIkUDqI/Ro2aYtuTfP4YKNhsPHcWyoehjTujPdviPQaiDbMq0wWWXrfVSNQzCr8jhEJVQJvne60NmGvWrHmAEEckXlqvKHoLvwyMQBoWFhidMxs3YCpBOwrC03wD4KmK/3qFfV6xraQA7ueul+QBMJ5il0crWO76WIdRFZZGfwXIB0D2FTz2HXSq3v5j3KGcXyxkL4nRqyEsrTc6pyM6mOnHcDcXNVPP8vF/dHZLWHO9SLw8/Agdv9bKOAiKHwjL1QdOrCcsdm28W13UXc889jUosb9Q5OZil4Xek2jt+QOFUuqy9TAKVcPo0wLva61MC7HvsB7q2QH16YN8nZFeQ1BEh9fe+s7Wd9OmTTd5Kphn5tgzDQoKWsa/c+fOPbxv376fXmPru3E/WSGAsjTE2bArVy7mkRshK4NG1IBUB1h1eK0UOkkvQK8uFly/BStYB2B0Mdl4adzbpeuqlzjWBpjadG+rAu/vUdenBatFHMb7MU39LNYxhGEmqQHi2kXFAvnSOdiAWRWAKy12PbiLGHgjOLSN8V+/Y23xjsXENh+z5zcRG18bIr2iWORfAv8r2lCmrNgVbqxnQyttb/93+uiIvdhpIPdO5TX5foJxC7qTYVdzCbG1pbDYU6WBUkI0ptlWl+x23UoFchKWq/mCCS9WrklhAL/hahkiB8BKVzVsbM33Clvfi4hvWBRC2RJi0X1Zw/uVMXnHvIKKGZ9fVnxuwEXsoCgk9r4VsqFMcbEH0KyeLugLY9vbvA3+3/25JzvDxzekmH2Uwvjxj/xWNhbmEx1kb9jDVkA0aEHxDQRbvndgBLDeC8cWx4ccv8iv5qidHPudGWpx4sLh4HTEUOtq2GWc04+O5M/Be0kpYPKthOyeb/zYiYNhZ7AtZfKa7CEskEW9cvStif+UD+3l5NNFdla+wmKfxRdZrH1S6VW+NGPcvu6K4a8N+O4QTFoMA//sgOG7AqxRfisjyqt+7slaG2TXJsqG59v6XFvK2NJXr/Rlk7/rJ07tXhH4r/uNLxnqc9JbfOCQdRA7MHTcuAJGI7013i6Hdcuujn/FRwn/6ue+rpF6pQ7J/bi07dZXR0D05soqcI7qiA2LLmJLvIP6z/uW2P+7jsn9rL/tAJYOpLP4LoLx80u5wLXx+B+cTUKEm3GYQAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxMi0wNS0wMlQxOTo0Njo1MSswMTowMBx1tHgAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTItMDUtMDJUMTk6NDY6NTErMDE6MDBtKAzEAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAABJRU5ErkJggg==') no-repeat; - text-indent: -999999px; - position: absolute; - z-index:2; -} -.ie6 #site-logo { - background: url('/cobrands/fixmystreet/images/ie_logo.gif') 0 -5px no-repeat; -} -.ie7 #site-logo { - background: url('/cobrands/fixmystreet/images/sprite.png') -3px -3px no-repeat; -} - -// this is a skip to nav for mobile users only -#nav-link { - width: 50px; - height: 48px; - background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAwCAMAAABkKdmIAAAACW9GRnMAAAAFAAADlACdjNY6AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAF5AAAQZgCwCYXlAAABEVBMVEUAAAAiIiIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAsJAAAAABPQAAAAAAlHgBnVAAAAACSdwAAAAAAAAAaFQAAAAAAAAAAAAAAAACRdgCqigAAAAAAAABHOgDCnwAAAACriwCAaAApIQDOqABIOwCgggBqVwB8ZQDVrgCwkADjuQCafgDftgDetQCqigDrwADHogDGoQDFoAD1yADzxgDyxQDwxAD/0AD///+ZbHkYAAAAWXRSTlMAAAECAwQFBgkLDA0OEBESExQVFxgeHyEkJSkqMTI2Oj0/Q0RHSEpOT1FSVVtmZmxsdX6Kj5ebnp+goaenqKmru7y9vsTY3uPk5OTl5+zs7e7x9PX3+Pr7/fI8qpUAAAABYktHRFoDu6WiAAABMklEQVRIx+3T2VLCMBSA4ZjU1hhpUKgWlaq0VSuutYg7IJuIogKKvv+LSM2AelNOuHCGGf77b7KcBKGwT2AzYej/CIYSPCBEhRKVCILVBJQkVCwIS0NJmglCYhkoycSIINyBEocPiAsl7ljkeypTMhHko9tpD+t0QavUSjcX+bDzy9vSPYj0zg523LDtvaNCD3aWh11ziXMeT64fP0OPX1xbmCVEXdyqwm/sNEWJMr96LXHJb4fLczR1IjWXx83kyv6r3CiLG05VdvpXd9IP5n36XyaStGCiNSS6XYaRsq0LgpnlNyGi6VsMC6IZXlAfLeqBZ2iCIELNbFBpvLQjempUgqxJxb76KdT0/Fw+spzvmVRB6McYlu24ETm2ZfwW/b1pTOeR6Uwj6E8YkxFhjMbuC8zPYpEN6mT7AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDEyLTA1LTAyVDE5OjQ2OjUxKzAxOjAwHHW0eAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxMi0wNS0wMlQxOTo0Njo1MSswMTowMG0oDMQAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAAElFTkSuQmCC') no-repeat; - display: block; - text-indent: -999999px; - position: absolute; - right:2em; - top:-2px; - &:hover { - top:2px; - } -} - - -#main-nav{ - ul{ - @include list-reset-soft; - li{ - a, span { - display: block; - padding: 0.5em 1em; - background:#f6f6f6; - color:#333; - font-size: 1.25em; - border-bottom: 0.25em solid #333; - } - a:hover, span.hover { - background: #333; - color:#fff; - text-decoration: none; - } - span { - background-color: #ccc; - } - } - &#mysoc-menu{ - li { - a { - color: $primary_text; - background: $primary; - &#mysoc-logo { - background-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIkAAAAyCAMAAABf9whNAAAACW9GRnMAAADwAAAAJgAMZizzAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAF5AAAQZgCwCYXlAAAANlBMVEUAAAAiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiL///90WH2CAAAAEHRSTlMADx8vP09fb3+Pn6+/z9/v+t8hjgAAAAFiS0dEEeK1PboAAAGqSURBVFjD7ZbNjtwgEAY/oIE2YKj3f9ocPDOZ3eN6FCUKdWsJQ+H+saXNZrPZbDabzf/GovwdIhH8LUzHn/PqI32Jcw1v0fjidQf30EZPqmMURXeT5F5kbYwqSQbeWpAU6xg961pT+mgm+WR4Ke6SzG9JwQRWB6iaTClCzQBLknT0AibZAnCBSx2ALACGQ5JOznsmq1TA82LKIalC6Jwh5seaMGdUWKxiJQpclWVqLNlJsxThUIB6z8Qft3FQgEODrs4qUuj9qoljpAr2euKkmxVIjzrpTBUI90xMGgzJQGrMAEUGrGKQn6c7/HbngT1MMqRO1wdNDA6WpNgW5Ld38s1kuLt7fPbO5Lg7Z76ZaLJoV3WAa6wsxbmiyrMMruyMVxc3SaqvAv+YSQWS1Fs9oAi8jQKmsGB4zwJXgdO9VWnAkaUAHJ81CTAkLYAm5ZbB/QhSmm9d7Ff7Splr5jaI90zMgpQsScHsGmRFUsheH6O1jecR5m5BZlFSzF5NkpJ7lMJ85etDlPWjHdMJ6aMiFdYPdgzw6Q90Yvwo2+fM+3dps9lsNpvNP8gvi7UYry9B6TcAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTItMDUtMDJUMTk6NDY6NTErMDE6MDAcdbR4AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDEyLTA1LTAyVDE5OjQ2OjUxKzAxOjAwbSgMxAAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAASUVORK5CYII='); - background-repeat:no-repeat; - text-indent:-999999px; - } - } - } - } - } -} -.ie6 #main-nav ul#mysoc-menu li a#mysoc-logo { - background: url('/cobrands/fixmystreet/images/ie_mysoc_logo.gif') center no-repeat; -} -.ie7 #main-nav ul#mysoc-menu li a#mysoc-logo { - background: url('/cobrands/fixmystreet/images/sprite.png') -240px -38px no-repeat; -} - -//defines where the table caption is (login stuff on mob, nav menu on desktop) -.wrapper { - width:100%; - display:table; - caption-side:bottom; -} -// this is the user's logged in details or the login link etc -#user-meta { - p { - position: relative; - color: #fff; - background: $primary; - padding:1em 6em 1em 1em; - a { - position: absolute; - right:1em; - @include inline-block; - text-transform:uppercase; - font-size:0.75em; - background:#333; - padding:0.25em 0.75em; - color:#fff; - @include border-radius(0.25em); - } - } -} - - -// #key-tools is the list that's pulled out an stick to the bottom of the page of desktop, below is mostly just aesthetic -.shadow-wrap { - @extend .full-width; - ul#key-tools{ - @include list-reset-soft; - margin-bottom: 1em; - display: table; - width:100%; - li{ - display: table-cell; - vertical-align: bottom; - text-align: center; - border-right:0.25em solid #fff; - &:last-child { - border-right:none; - } - input[type=submit] { - width: 100%; - border: none; - } - a, input[type=submit] { - display: block; - background-color: #f5f5f5; - background-repeat: no-repeat; - color:#333; - padding:4em 2em 1em 2em; - text-transform:uppercase; - font: { - size:0.6875em; - font-family: 'PTSansRegular',PT Sans,Verdana,Arial,Sans-Serif; - } - &:hover, &.hover { - text-decoration:none; - background-color:#333; - color:#fff; - } - &.abuse { - background-image:url('/cobrands/fixmystreet/images/sprite.png'); - background-position:center -2424px; - } - &.feed { - background-image:url('/cobrands/fixmystreet/images/sprite.png'); - background-position:center -2563px; - } - &.chevron { - background-image:url('/cobrands/fixmystreet/images/sprite.png'); - background-position:center -2716px; - } - &.hover { - background-image:url('/cobrands/fixmystreet/images/sprite.png'); - background-position:center -2064px; - } - } - } - } -} - -//because display:table doesn't work we float -.ie6, .ie7 { - .shadow-wrap { - ul#key-tools{ - background:#f5f5f5; - li{ - float:left; - a { - padding-left:1.5em; - padding-right:3em; - } - } - } - } -} -.ie6 .shadow-wrap ul#key-tools li a { - &.abuse { - background-image:url('/cobrands/fixmystreet/images/ie_key_tools_sprite.gif'); - background-position: right 0px; - } - &.feed { - background-image:url('/cobrands/fixmystreet/images/ie_key_tools_sprite.gif'); - background-position: right -58px; - } - &.chevron { - background-image:url('/cobrands/fixmystreet/images/ie_key_tools_sprite.gif'); - background-position: right -116px; - } - &:hover { - background-image:url('/cobrands/fixmystreet/images/ie_key_tools_sprite_dark.gif'); - } -} - - -//footer blocks -#footer-mobileapps { - @extend .full-width; - padding:1em; - h4 { - margin:0; - } - ul { - @include list-reset-soft; - li { - border-bottom:1px solid #AFAFAF; - &:last-child { - border-bottom:none; - } - a { - display:block; - padding:0.5em 0; - } - } - } -} - -#footer-help { - ul { - @include list-reset-soft; - li { - border-bottom:1px solid #AFAFAF; - &:last-child { - border-bottom:none; - } - h4 { - margin:0.75em 0 0.25em 0; - } - p { - font-size:0.75em; - } - } - } -} - - - -/*BUTTONS*/ - -// Default style set for buttons, inputs and .btn class. Red and green class available. - -button, input[type=submit],.btn{ - @include button-reset; -} - -.green-btn, -button.green-btn, -input.green-btn{ - @include button-reset(#9FDE23, #7FB900, #5B9700, #fff, #9FDE23, #7FB900, #5B9700, #fff); -} - -.red-btn, -button.red-btn, -input.red-btn{ - @include button-reset(#FF0038, #BF002A, #80001C, #fff, #FF0038, #BF002A, #80001C, #fff); -} - -.final-submit, -input.final-submit { - margin:1em 0.5em; - float:right; -} - -.button-right, -.button-left, -a.button-right, -a.button-left { - @include inline-block; - cursor:pointer; - font-size: 1em; - line-height: 1; - margin:0; - border:1px solid #999; - color:#333; - background: #eee; - @include border-radius(4px); - &:hover{ - color:#fff; - background:#777; - text-decoration: none; - border:1px solid #666; - } -} -.button-right, -a.button-right, -:hover.button-right, -a:hover.button-right { - padding:1em 3em 1em 1em; - background-image: url('/cobrands/fixmystreet/images/sprite.png'); - background-repeat:no-repeat; - background-position:right -686px; -} - -.button-left, -a.button-left, -:hover.button-left, -a:hover.button-left { - padding:1em 1em 1em 3em; - background-image: url('/cobrands/fixmystreet/images/sprite.png'); - background-repeat:no-repeat; - background-position:-18px -802px; -} - -.big-green-banner { - position: relative; - z-index:1000; - top:-1.75em; - background: $contrast1; - color: #fff; - padding:1em; - text: { - transform:uppercase; - align:center; - } - font-size:0.875em; - &:before { - content: ""; - left:-0.5em; - top:0; - position: absolute; - width: 0; - height: 0; - border-left: 0.5em solid transparent; - border-bottom: 0.5em solid $contrast1_dark; - } -} - -.banner { - position: relative; - z-index:1100; - p { - position: absolute; - top:-1.95em; - right:0; - @include inline-block; - font-size:0.6875em;//11px - line-height:1em; - padding:0.5em 1em; - margin:0; - color:#1a1a1a; - background: #ccc; - text: { - transform:uppercase; - align:center; - } - &:before { - content: ""; - left:-0.5em; - top:0; - position: absolute; - width: 0; - height: 0; - border-left: 0.5em solid transparent; - border-bottom: 0.5em solid #888; - } - &#fixed { - color:#fff; - background: $contrast1; - &:before { - border-bottom: 0.5em solid $contrast1_dark; - } - } - } -} - -/*OTHER*/ - -.plain-list { - @include list-reset-soft; - li { - margin-bottom:1em; - } -} - -.issue-list{ - margin: 0 0 1em 0; - padding: 0; - border-bottom: 0.25em solid $primary; - li{ - list-style: none; - background: #f6f6f6; - margin: 0.25em 0 0 0; - padding: 0.5em 1em; - display:block; - .update-wrap { - display:table; - width:100%; - .update-text, - .update-img { - display:table-cell; - vertical-align:top; - p { - margin-bottom: 0.5em; - } - } - .update-img { - text-align:right; - img { - margin:-0.5em -1em 0 0.5em; - height:auto; - } - } - } - } -} -//display:table fixes -.ie7, .ie7 { - .issue-list li .update-wrap { - .update-text { - float:left; - width:19em; - } - .update-img { - float:right; - } - } -} - -.issue-list-a { - margin: 0 0 1em 0; - padding: 0; - border-bottom: 0.25em solid $primary; - li { - list-style: none; - margin:0; - padding:0; - margin: 0.25em 0 0 0; - /* see note below about this */ - display:table; - background: #f6f6f6; - color:#222222; - width:100%; - &:hover { - text-decoration:none; - color:#222222; - background:#e6e6e6; - } - a { - color:#222222; - } - a:hover { - color:#222222; - background:#e6e6e6; - text-decoration: none; - } - .text { - /* this is and the display:table above are required otherwise - on iphone the rows end up being slightly wider than the screen */ - display: table-cell; - width: 100%; - vertical-align:top; - padding: 0px 0px 0px 1em; - .img { - width: 90px; - float: right; - height:auto; - } - h4 { - padding-right: 1em; - padding-top: 0.25em; - margin:0; - } - small { - color:#666; - display: block; - padding-right: 1em; - padding-top: 0.25em; - padding-bottom: 0.25em; - } - } - >p { - margin: 0.25em 0 0 0; - padding: 0.5em 1em; - background: #f6f6f6; - } - } -} -.list-a { - @extend .issue-list-a; - a { - padding:0.5em 1em; - font-weight:bold; - } -} -//display:table fixes -.ie6, .ie7 { - .issue-list-a { - overflow:hidden; - li { - clear:both; - width:100%; - display:block; - overflow:hidden; - .text { - float:left; - } - } - } -} -.ie6 .issue-list-a li a { - height:5.5em; - .img { - height:60px; - } -} - -// fancybox gallery images have a magnifying glass in the corner -.update-img { - a { - @include inline-block; - position:relative; - span { - position:absolute; - top:0; - right:0; - display:block; - width:20px; - height:20px; - opacity: 0.5; - background:#fff url(/cobrands/fixmystreet/images/sprite.png) -16px -1098px no-repeat; - //hide text - http://nicolasgallagher.com/another-css-image-replacement-technique/ - font: 0/0 a; - color: transparent; - } - &:hover span { - opacity: 1; - } - } -} -//bit of a hack - as we can't use em's, push the span out to the right -//by how much it would be if the user did not resize the text -.issue-list li .update-wrap .update-img a span { - right:-16px; - top:-8px; -} - -.problem-header { - margin-bottom:1em; -} -.problem-header .update-img { - float: right; - margin-left: 0.5em; - margin-bottom: 0.5em; -} - -// map stuff -#map_box{ - @extend .full-width; - background: #333; - height: 29em; - margin-bottom: 1em; - overflow: hidden; - position: relative; - #map { - width:100%; - height:100%; - } -} - -// OpenLayers fix for navigation being top right -// Left and right so that zoom can be left, pan right. -#fms_pan_zoom { - right: 0.5em !important; - top: 0.5em !important; - left: 0.5em !important; -} -// The left and right of the above causes the navigation to move off-screen left in IE6. -// XXX Need to check IE7 -.ie6 #fms_pan_zoom { - left: auto !important; -} - -// Openlayers map controls (overrides) -#fms_pan_zoom_panup, -#fms_pan_zoom_pandown, -#fms_pan_zoom_panleft, -#fms_pan_zoom_panright, -#fms_pan_zoom_zoomin, -#fms_pan_zoom_zoomout { - width:36px !important; - height:36px !important; - text-indent:-999999px; - opacity:0.85; - background:url('/cobrands/fixmystreet/images/sprite.png') no-repeat; - &:hover { - opacity:1; - } - filter: none !important; // Override OpenLayers PNG handling of the navigation -} - -#fms_pan_zoom_zoomworld { - display:none !important; - visibility:none !important; -} - -#fms_pan_zoom_panup { - background-position:-42px -222px; - right:30px !important; - left: auto !important; - top:0 !important; -} -#fms_pan_zoom_pandown { - background-position:-42px -282px; - right:30px !important; - left: auto !important; - top:72px !important; -} -#fms_pan_zoom_panleft { - background-position:-12px -252px; - width:48px !important; - right:48px !important; - left: auto !important; - top:36px !important; -} -#fms_pan_zoom_panright { - background-position:-60px -252px; - width:48px !important; - right:0 !important; - left: auto !important; - top:36px !important; -} -#fms_pan_zoom_zoomin { - background-position:-152px -223px; - height:44px !important; - left:0 !important; - top:0 !important; -} -#fms_pan_zoom_zoomout { - background-position:-152px -259px; - height:44px !important; - left:0 !important; - top:44px !important; -} - -//hide pins, show old reports etc -#sub_map_links { - position: absolute; - left: 0; - right:0; - bottom: 0; - z-index: 1100; - background:#333; - background:rgba(0, 0, 0, 0.7); - margin:0; - a { - @include inline-block; - font-size:0.6875em; - color:#fff; - padding:0.6em 3em 0.5em 1em; - background-repeat:no-repeat; - &#hide_pins_link { - background-image:url('/cobrands/fixmystreet/images/sprite.png'); - background-position: right -3976px; - } - &#all_pins_link { - background-image:url('/cobrands/fixmystreet/images/sprite.png'); - background-position: right -4022px; - } - &#map_permalink { - background-image:url('/cobrands/fixmystreet/images/sprite.png'); - background-position: right -4070px; - } - &.feed { - background-image:url('/cobrands/fixmystreet/images/sprite.png'); - background-position: right -3936px; - } - &:hover { - background-color:#000; - text-decoration:none; - } - } -} - -.ie6 #sub_map_links a { - &#hide_pins_link { - background-image:url('/cobrands/fixmystreet/images/ie_sub_map_links_sprite.gif'); - background-position: right 1px; - } - &#all_pins_link { - background-image:url('/cobrands/fixmystreet/images/ie_sub_map_links_sprite.gif'); - background-position: right -45px; - } - &#map_permalink { - background-image:url('/cobrands/fixmystreet/images/ie_sub_map_links_sprite.gif'); - background-position: right -93px; - } -} - -#mob_sub_map_links { - position: absolute; - z-index:1100; - bottom:0; - display:table; - margin:0; - width:100%; - background:rgba(0, 0, 0, 0.7); - a { - color:#fff; - width:50%; - padding:0.5em 0; - font-size:1em; - display:table-cell; - text-align:center; - &:hover { - background:#000; - text-decoration:none; - } - } - &.map_complete { - background:none; - display:block; - border-bottom:4px solid #fff; - a#try_again { - display:block; - margin:0 auto 6em auto; - background:rgba(0, 0, 0, 0.8); - @include border-radius(0.5em); - } - a#mob_ok { - position:absolute; - right:1em; - bottom:0; - height:20px; - padding-top:30px; - display:block; - width:4em; - background:#fff url('/cobrands/fixmystreet/images/sprite.png') 12px -4140px no-repeat; - color:#000; - } - } -} - -.mobile-map-banner { - margin:0; - position: absolute; - top:0; - left:0; - right:0; - font-size:0.75em; - background:rgba(0, 0, 0, 0.7); - padding:0.75em 30px; - a { - @include button-reset(#333, #1a1a1a, #1a1a1a, #fff, #333, #1a1a1a, #1a1a1a, #fff); - font: { - weight:normal; - size:0.875em; - } - line-height:1; - padding:0.5em 0.75em; - position:absolute; - left:0.3em; - top:0.3em; - } -} - -.olControlAttribution { - bottom: 3.25em !important; - right: 0.25em !important; - left: 0.25em !important; - color: #222222; - font-size:0.75em !important; -} -.olControlAttribution img { - vertical-align: bottom; -} -.olControlPermalink { - bottom: 3px !important; - right: 3px; -} - -/* Drag is only present in noscript form. XXX Copy from core. */ -#drag { - input, img { - position: absolute; - border: none; - max-width: none; - } - input { - cursor: crosshair; - background-color: #cccccc; - } - img { - cursor: move; - } - img.pin { - z-index: 100; - background-color: inherit; - } - a img.pin { - cursor: pointer; - cursor: hand; - } -} - -// only on mobile, this is a sidebar on desk (#report-a-problem-sidebar) -a.rap-notes-trigger, -a:hover.rap-notes-trigger { - display:block; - width:90%; - padding-left:5%; - padding-right:5%; -} -.rap-notes { - margin:1em 0; -} - -//report a problem tabs -#problems-nav { - padding:0 1em; - overflow:hidden; - border-bottom:0.25em solid #333; - ul { - @include list-reset-soft; - display:table; - width:100%; - li { - display:table-cell; - border-right:0.25em solid #fff; - &:last-child { - border-right:none; - } - a { - display:block; - background:#e2e2e2; - color:#333; - padding:1em; - text: { - transform:uppercase; - align:center; - } - &:hover { - text-decoration:none; - background:#e6e6e6; - } - &.active { - background:#333; - color:#fff; - } - } - } - } -} - -//display:table fixes -.ie6, .ie7 { - #problems-nav { - clear:both; - margin:0; - padding:0; - ul li { - float:left; - } - } -} - - -table.nicetable { - width:100%; - margin-bottom:2em; - thead { - border-bottom:0.25em solid #ccc; - th { - font-size:0.75em; - } - } - tr { - &.a { - background:#f6f6f6; - } - &:nth-child(even) { - background:#f6f6f6; - } - &.gone { - color: #666666; - background-color: #cccccc; - } - &:hover { - background:#FFF5CC; - cursor:pointer; - } - td { - padding:0.25em; - a { - &:hover { - text-decoration:none; - } - } - } - } - .title { - text-align:left; - } - .data { - width:12%; - } -} - -.promo { - @extend .full-width; - color: $primary_text; - background: $primary; - padding:1em; - margin-bottom:1em; - overflow:hidden; - position: relative; - .close-promo { - position:absolute; - top:0.5em; - right:0.5em; - display:block; - width:16px; - height:16px; - text-indent:-999999px; - background:url(/cobrands/fixmystreet/images/sprite.png) -341px -263px no-repeat; - @include border-radius(4px); - &:hover { - background:#222 url(/cobrands/fixmystreet/images/sprite.png) -341px -223px no-repeat; - } - } -} - -.alert { - @extend .full-width; - background:#ff0000; - padding:1em; - margin-bottom:1em; - color:#fff; - a, a:hover { - color:$primary; - } -} - -.pagination { - text-align:center; - padding:0.5em 1em; - background:#eee; - position:relative; - .prev { - position:absolute; - left:0.5em; - } - .next { - position:absolute; - right:0.5em; - } - a { - @include inline-block; - color: $primary_text; - background: $primary; - padding-left:0.5em; - padding-right:0.5em; - color:#1a1a1a; - &:hover { - color:#1a1a1a; - text-decoration:none; - background:$primary/1.1; - } - } -} - -// this is a bit of a hack to get some differentation between desk and mobile -.desk-only { - display:none; -} - -// hide anything with this class if js is working -.js .hidden-js { - display: none; - visibility: hidden; -} - -// hide anything with this class if js is NOT working -.no-js .hidden-nojs { - display: none !important; - visibility: hidden; -} - - -/* Front page */ -#front-main { - text-align:center; - margin: 1em; - h2 { - font: { - style:italic; - font-family: 'PTSansRegular',PT Sans,Verdana,Arial,Sans-Serif; - size:1.1875em; - } - color:#4d4d4d; - } - p { - margin: 0.5em 0 0; - } - #postcodeForm { - @extend .full-width; - padding:1em; - color: $primary_text; - background: $primary; - font-family: 'PTSansRegular',PT Sans,Verdana,Arial,Sans-Serif; - label { - margin:0; - } - div { - display:table; - width:100%; - background:#fff; - border:1px solid $primary; - input#pc { - display:table-cell; - margin:0; - padding:0.25em 2%; - width:86%; - border:none; - background:none; - line-height:1.5em; - } - input#submit { - display:table-cell; - border:none; - padding:0; - margin:0; - width:14%; - height:35px; - background:$primary; - color:#fff; - text-transform:uppercase; - @include border-radius(0); - &:hover { - background:lighten($primary, 10%); - } - } - } - } - a#geolocate_link { - @include inline-block; - vertical-align:top; - background:#1a1a1a; - color:#C8C8C8; - padding:0.5em; - font: { - font-family: 'PTSansRegular',PT Sans,Verdana,Arial,Sans-Serif; - size:0.8125em; - } - @include border-radius(0 0 0.25em 0.25em); - &:hover { - text-decoration:none; - background:#2a2a2a; - } - } -} - -#front-howto { - #front_stats { - display:table; - width:100%; - color: $primary_text; - background: $primary; - font-family: 'PTSansRegular',PT Sans,Verdana,Arial,Sans-Serif; - div { - display:table-cell; - text-align:center; - padding:1em; - line-height:1.25em; - font: { - size:0.8125em; - weight:bold; - } - big { - display:block; - margin-bottom:0.5em; - font-size:1.5385em; - } - } - } -} - -#front-recently { - .issue-list-a { - border-bottom:none; - } -} - -#alerts { - ul { - margin-bottom: 1em; - } - li { - padding: 0em; - margin-bottom: 0.5em; - } - .a { - background: #f6f6f6; - } - img[width="16"] { - float: right; - } -} - diff --git a/web/cobrands/stevenage/_h5bp.scss b/web/cobrands/stevenage/_h5bp.scss deleted file mode 100644 index f4078cca6..000000000 --- a/web/cobrands/stevenage/_h5bp.scss +++ /dev/null @@ -1,271 +0,0 @@ -/* - * HTML5 ✰ Boilerplate, with minor tweaks. - * - * What follows is the result of much research on cross-browser styling. - * Credit left inline and big thanks to Nicolas Gallagher, Jonathan Neal, - * Kroc Camen, and the H5BP dev community and team. - * - * Detailed information about this CSS: h5bp.com/css - * - * ==|== normalize ========================================================== - */ - - -/* ============================================================================= - HTML5 display definitions - ========================================================================== */ - -article, aside, details, figcaption, figure, footer, header, hgroup, nav, section { display: block; } -audio, canvas, video { display: inline-block; *display: inline; *zoom: 1; } -audio:not([controls]) { display: none; } -[hidden] { display: none; } - - -/* ============================================================================= - Base - ========================================================================== */ - -/* - * 1. Correct text resizing oddly in IE6/7 when body font-size is set using em units - * 2. Force vertical scrollbar in non-IE - mySociety removed. - * 3. Prevent iOS text size adjust on device orientation change, without disabling user zoom: h5bp.com/g - */ - -html { font-size: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; } - -/* mySociety change: line-height from 1.4 */ -body { margin: 0; font-size: 1em; line-height: 1.5; } - -/* mySociety addition: background colour */ -body, button, input, select, textarea { - font-family: sans-serif; - color: #222; - background-color: #fff -} - -/* - * Remove text-shadow in selection highlight: h5bp.com/i - * These selection declarations have to be separate - * mySociety change: background colour from #fe57a1 - */ - -::-moz-selection { background: #ffeeaa; color: #000; text-shadow: none; } -::selection { background: #ffeeaa; color: #000; text-shadow: none; } - - -/* ============================================================================= - Links - ========================================================================== */ - -/* mySociety removal: link colours specified elsewhere */ -a:focus { outline: thin dotted; } - -/* Improve readability when focused and hovered in all browsers: h5bp.com/h */ -a:hover, a:active { outline: 0; } - - -/* ============================================================================= - Typography - ========================================================================== */ - -abbr[title] { border-bottom: 1px dotted; } - -b, strong { font-weight: bold; } - -/* mySociety change: from 1em 40px; */ -blockquote { margin: 1.5em 2em; } - -dfn { font-style: italic; } - -hr { display: block; height: 1px; border: 0; border-top: 1px solid #ccc; margin: 1em 0; padding: 0; } - -ins { background: #ff9; color: #000; text-decoration: none; } - -mark { background: #ff0; color: #000; font-style: italic; font-weight: bold; } - -/* Redeclare monospace font family: h5bp.com/j */ -pre, code, kbd, samp { font-family: monospace, serif; _font-family: 'courier new', monospace; font-size: 1em; } - -/* Improve readability of pre-formatted text in all browsers */ -pre { white-space: pre; white-space: pre-wrap; word-wrap: break-word; } - -q { quotes: none; } -q:before, q:after { content: ""; content: none; } - -small { font-size: 85%; } - -/* Position subscript and superscript content without affecting line-height: h5bp.com/k */ -sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline; } -sup { top: -0.5em; } -sub { bottom: -0.25em; } - - -/* ============================================================================= - Lists - ========================================================================== */ - -/* mySociety change: left 40px, top/bottom 1em */ -ul, ol { margin: 0 0 1.5em; padding: 0 0 0 2em; } -dd { margin: 0 0 0 2em; } -nav ul, nav ol { list-style: none; list-style-image: none; margin: 0; padding: 0; } - - -/* ============================================================================= - Embedded content - ========================================================================== */ - -/* - * 1. Improve image quality when scaled in IE7: h5bp.com/d - * 2. Remove the gap between images and borders on image containers: h5bp.com/e - */ - -img { border: 0; -ms-interpolation-mode: bicubic; vertical-align: middle; } - -/* - * Correct overflow not hidden in IE9 - */ - -svg:not(:root) { overflow: hidden; } - - -/* ============================================================================= - Figures - ========================================================================== */ - -figure { margin: 0; } - - -/* ============================================================================= - Forms - ========================================================================== */ - -form { margin: 0; } -fieldset { border: 0; margin: 0; padding: 0; } - -/* Indicate that 'label' will shift focus to the associated form element */ -label { cursor: pointer; } - -/* - * 1. Correct color not inheriting in IE6/7/8/9 - * 2. Correct alignment displayed oddly in IE6/7 - */ - -legend { border: 0; *margin-left: -7px; padding: 0; } - -/* - * 1. Correct font-size not inheriting in all browsers - * 2. Remove margins in FF3/4 S5 Chrome - * 3. Define consistent vertical alignment display in all browsers - */ - -button, input, select, textarea { font-size: 100%; margin: 0; vertical-align: baseline; *vertical-align: middle; } - -/* - * 1. Define line-height as normal to match FF3/4 (set using !important in the UA stylesheet) - */ - -button, input { line-height: normal; } - -/* - * 1. Display hand cursor for clickable form elements - * 2. Allow styling of clickable form elements in iOS - * 3. Correct inner spacing displayed oddly in IE7 (doesn't effect IE6) - */ - -button, input[type="button"], input[type="reset"], input[type="submit"] { cursor: pointer; -webkit-appearance: button; *overflow: visible; } - -/* - * Consistent box sizing and appearance - */ - -input[type="checkbox"], input[type="radio"] { box-sizing: border-box; padding: 0; } -input[type="search"] { -webkit-appearance: textfield; -moz-box-sizing: content-box; -webkit-box-sizing: content-box; box-sizing: content-box; } -input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; } - -/* - * Remove inner padding and border in FF3/4: h5bp.com/l - */ - -button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0; } - -/* - * 1. Remove default vertical scrollbar in IE6/7/8/9 - * 2. Allow only vertical resizing - */ - -textarea { overflow: auto; vertical-align: top; resize: vertical; } - - -/* ============================================================================= - Tables - ========================================================================== */ - -table { border-collapse: collapse; border-spacing: 0; } -td { vertical-align: top; } - - -/* ==|== primary styles ===================================================== - Author: - ========================================================================== */ - - - - - - - - - - - - - - - - -/* ==|== non-semantic helper classes ======================================== - Please define your styles before this section. - ========================================================================== */ - -/* For image replacement */ -.ir { display: block; border: 0; text-indent: -999em; overflow: hidden; background-color: transparent; background-repeat: no-repeat; text-align: left; direction: ltr; *line-height: 0; } -.ir br { display: none; } - -/* Hide from both screenreaders and browsers: h5bp.com/u */ -.hidden { display: none !important; visibility: hidden; } - -/* Hide only visually, but have it available for screenreaders: h5bp.com/v */ -.visuallyhidden { border: 0; clip: rect(0 0 0 0); height: 1px; margin: -1px; overflow: hidden; padding: 0; position: absolute; width: 1px; } - -/* Extends the .visuallyhidden class to allow the element to be focusable when navigated to via the keyboard: h5bp.com/p */ -.visuallyhidden.focusable:active, .visuallyhidden.focusable:focus { clip: auto; height: auto; margin: 0; overflow: visible; position: static; width: auto; } - -/* Hide visually and from screenreaders, but maintain layout */ -.invisible { visibility: hidden; } - -/* Contain floats: h5bp.com/q */ -/* mySociety change: rename to cf */ -.cf:before, .cf:after { content: ""; display: table; } -.cf:after { clear: both; } -.cf { *zoom: 1; } - - - -/* ==|== print styles ======================================================= - Print styles. - Inlined to avoid required HTTP connection: h5bp.com/r - ========================================================================== */ - -/* mySociety removal: bits of * and :after */ -@media print { - * { box-shadow:none !important; text-shadow: none !important; filter:none !important; -ms-filter: none !important; } /* Black prints faster: h5bp.com/s */ - a, a:visited { text-decoration: underline; } - abbr[title]:after { content: " (" attr(title) ")"; } - pre, blockquote { border: 1px solid #999; page-break-inside: avoid; } - thead { display: table-header-group; } /* h5bp.com/t */ - tr, img { page-break-inside: avoid; } - img { max-width: 100% !important; } - @page { margin: 0.5cm; } - p, h2, h3 { orphans: 3; widows: 3; } - h2, h3 { page-break-after: avoid; } -} diff --git a/web/cobrands/stevenage/_layout.scss b/web/cobrands/stevenage/_layout.scss deleted file mode 100644 index 5b2123280..000000000 --- a/web/cobrands/stevenage/_layout.scss +++ /dev/null @@ -1,1100 +0,0 @@ -@import "compass"; -@import "../fixmystreet/_mixins"; - -//hacks for desk/mob only stuff -.desk-only { - display: block; -} -.mob-only { - display: none; -} - -body { - background: #dddddb; //#1A1A1A url(/cobrands/fixmystreet/images/tile.jpg) 0 0 repeat; -} - -h1 { - margin-top: 0; -} - -// Page wrapper and header bits follow - -.container{ - margin: 0 auto; - padding: 0em; - width: 60em; - position: relative; - z-index:1; -} - -//z-index stack order gets reset to 0 in ie6/7 if you position anything, -//so to fix things we give it a high value (don't ask me why) -//see: http://brenelz.com/blog/squish-the-internet-explorer-z-index-bug/ -//this affects #site-logo -.ie6, .ie7 { - .container { - z-index:100; - } -} - -.wrapper{ - display: table; - caption-side: top; - width: 100%; - .table-cell { - display:table-cell; - } -} - -//pad the top of the wrapper to allow space for the menu to fit in -//when its positioned absolute below -.ie6, .ie7 { - .wrapper { - padding-top:4em; - } -} - -.nav-wrapper{ - display: table-caption; - .nav-wrapper-2{ - width: 100%; - min-height: min-intrinsic; - position: absolute; - top:9.5em; - border-top: none; - border-left:0; - border-right:0; - z-index:2; - padding-top: 0.75em; - padding-bottom: 0.25em; - background-color: #6b6969; - background-image: -webkit-gradient(linear, left top, left bottom, from(#6b6969), to(#555454)); /* Safari 4+, Chrome */ - background-image: -webkit-linear-gradient(top, #6b6969, #555454); /* Chrome 10+, Safari 5.1+, iOS 5+ */ - background-image: -moz-linear-gradient(top, #6b6969, #555454); /* Firefox 3.6-15 */ - background-image: -o-linear-gradient(top, #6b6969, #555454); /* Opera 11.10-12.00 */ - background-image: linear-gradient(to bottom, #6b6969, #555454); /* Firefox 16+, IE10, Opera 12.50+ */ - } -} - -//position absolute the menu as ie doesn't like display:table -.ie6, .ie7 { - #stevenage_cc_header { - position:absolute; - top:0; - } - .nav-wrapper { - position: absolute; - top:0; - left:0; - width:100%; - .nav-wrapper-2 { - // position static as well so we fix lots of the z-index issues - //position:static; - } - } -} - -// Resets a lot of the mobile styling. #site-header only used to help position logo on desktop -#site-header { - height: auto; - background: none; - border-top: 0px; - .container { - position: static;//reset position so the nav links become clickable - } -} -#site-logo { - top: 0.9em; - position: absolute; - z-index: 3; -} -.ie6, .ie7 { - #site-header { - height:3em; - .container { - //ie broken z-index bug: the site-logo won't appear if we don't do this - //doesn't seem to render the nav link unclickable like in other browsers - position: relative; - } - } - #site-logo { - position: absolute; - top:-3.25em; - } -} -#nav-link { - left:-999999px; -} -#main-nav{ - margin: 0 auto; - padding: 0em; - width: 60em; - ul{ - list-style: none; - padding: 0px; - margin: 0px; - float:none; - li{ - list-style: none; - display: inline; - margin: 0px; - padding: 0px; - float:left; - a, - span { - display: block; - color:#fff; - background: none; - border-bottom: none; - margin: 0; - margin-right: 2px; - font-family: 'PTSansRegular',PT Sans,Verdana,Arial,Sans-Serif; - } - } - &#main-menu{ - li{ - a, span{ - padding: 0.5em 0.75em; - font-size: 0.8em; - margin: 0; - @include border-radius(0.25em); - } - a:hover{ - background:#444; - } - a.report-a-problem-btn { - color: $primary_text; - background: $primary; - padding:0.5em 0.75em; - margin:0; - margin-bottom: 0; - margin-left: 0.25em; - color:#fff; - @include border-radius(0.25em); - &:hover { - background:$primary/1.1; - } - } - span { - color: #fff; - background-color: #066539; - } - } - } - &#mysoc-menu{ - padding: 0em 0.5em; - margin-left: 0.25em; - background:$primary url(/cobrands/fixmystreet/images/tile-y.jpg); - @include border-radius(0 0 0.375em 0.375em); - li{ - a{ - background:none; - color:#000; - text-transform: uppercase; - font-size: 0.6875em; - padding: 1.3em 0.7em 1em 0.7em; - &#mysoc-logo { - width:84px; - height:16px; - background-position: -20px -5px; - opacity: 0.8; - &:hover { - opacity: 1; - } - } - &:hover{ - color:#fff; - } - } - } - } - } -} -.ie7 #main-nav ul#mysoc-menu li a#mysoc-logo { - background-position: -260px -43px; -} - -// .content Is the white box - -// The narrow single column box -.content { - width: 27em; - margin-top: 3em; - margin-bottom: -1em; - margin-left: 0.5em; - padding: 1em 1em 3em; - background: #fff; - @include box-shadow(0px 0px 6px 1px #000); -} -.ie6, .ie7, .ie8 { - .content { - // If no box-shadow, just want a boring black border to stand it out from the map. - //border: 1px solid #666; - //take off margins so we line up properly - margin: 0 0 0 0.5em; - } -} - -// map page - has fixed header and different styling -body.mappage { - #stevenage_cc_header{ - position: fixed; - } - .container { - width: auto; - } - .content { - float:left; - margin-top: 9em; - } -/* - #main-nav ul#main-menu li a, - #main-nav ul#main-menu li span { - padding: 1.4em 0.75em 1.35em 0.75em; - } - #main-nav ul#main-menu li a.report-a-problem-btn { - padding: 0.5em; - margin:0.9em 0.25em 0.85em 0.25em; - } -*/ - .nav-wrapper{ - .nav-wrapper-2{ - position: absolute; - top: 11em; - bottom: auto; - left: 0.5em; - width: 29em; - padding-top: 0.15em; - z-index: 0; - } - - } - #site-logo{ - position: fixed; - } -} -.ie6, .ie7 { - body.mappage { - #stevenage_cc_header { - position:absolute; - top:0; - } - .content{ - margin-top:6em; - } - // The below is *mandatory* to allow pins/zoom to be clickable in IE6/7. Do NOT remove. - .container { - float: left; - width: 27em; - margin-left: 0.7em; - } - .nav-wrapper{ - z-index:1; - .nav-wrapper-2 { - //position:static; - } - } - #site-logo { - position: absolute; - } - } -} -//ie8 needs different stuff on .nav-wrapper so we -//have to define all the rest of it again as this resets -//the z-index base yet again :S -.ie8 { - body.mappage { - #stevenage_cc_header{ - position:absolute; - top:0; - } - .nav-wrapper{ - position: relative; - z-index:0; - .nav-wrapper-2{ - position:absolute; - } - - } - #site-logo { - position: absolute; - } - } -} - - - -// full width page -body.fullwidthpage { - .content { - width: 57em; - box-shadow: none; - -webkit-box-shadow: none; - -moz-box-shadow:none; - -o-box-shadow:none; - background: none; - } - .intro { - width:40em; - } -} -// two thirds width page, also has option for a sidebar which can be sticky or not -body.twothirdswidthpage { - .content { - width:40em; - position: relative; - aside { - background:#eee; - position:absolute; - left:42em; - top:0; - z-index: -1; - width:13em; - padding:1em; - @include box-shadow(0px 0px 6px 1px #000); - h2 { - margin-top: 0; - } - img { - margin-bottom: 0.25em; - } - } - .sticky-sidebar { - position: absolute; - left:42em; - z-index: -1; - aside { - position: fixed; - top:19em; - left:auto; - } - } - } -} -//as ie6 doesn't like 'fixed' we will make it absolute again -.ie6 body.twothirdswidthpage .content .sticky-sidebar { - position:static; - aside { - position:absolute; - left:42em; - top:0; - } -} - - -// table wrapper - this enables anything to become a -// table with div children as table cells -.tablewrapper { - display:table; - width:100%; - padding:0 0 1em 0; - >div { - display:table-cell; - width:50%; - } - .full-width { - width:auto; - margin:0; - } -} - -//fix table to be a block for ie, float the children -.ie6, .ie7 { - .tablewrapper { - display:block; - div {//ie6 doesn't support '>div', so we'll go with the somewhat risker 'div' - width:48%; - display:block; - float: left; - border:none !important; - } - } -} - -// adds border to the top and goes full width -.bordered { - margin:0 -1em; - padding:0 1em; - width:auto; - border-top:0.25em solid $primary; -} - -//footer blocks -#footer-mobileapps { - border-right:1em solid transparent; - background:none; - padding:0; - @include box-shadow(inset rgba(0, 0, 0, 0) 0 0 0); - h2 { - color:#222; - margin-top:0; - } - ul { - @include list-reset; - li { - border-bottom:none; - float:left; - margin:0 1em 1em 0; - a { - color:#222; - padding:0; - width: 96px; - height: 32px; - margin:0 auto; - text-indent: -999999px; - background: url(/cobrands/fixmystreet/images/sprite.png) -12px -3610px no-repeat; - opacity: 0.8; - &:hover { - opacity: 1; - } - &.m-app-iphone { - background-position: -12px -3610px; - } - &.m-app-droid { - background-position: -12px -3756px; - } - &.m-app-nokia { - background-position: -12px -3820px; - width:74px; - } - } - } - } -} -.ie6, .ie7 { - #footer-mobileapps { - margin:0 0.5em; - margin-right:2%; - } -} -.ie6 #footer-mobileapps ul li a { - background:url(/cobrands/fixmystreet/images/ie_mobileapps.gif) -1px -1px no-repeat; - &.m-app-droid { - background-position: -1px -148px; - } - &.m-app-nokia { - background-position: -1px -212px; - width:74px; - } -} - -#footer-help { - border-left:1em solid transparent; - ul { - display:table; - li { - display:table-cell; - border-bottom:none; - &:last-child { - border-left:1.25em solid transparent; - } - } - } -} -.ie6, .ie7 { - #footer-help { - margin-left:2%; - ul { - width:100%; - li { - float:left; - width:45% - } - } - } -} - - -// map box (fallback for non js really as most users -// will have fullscreen map) -#map_box{ - position: absolute; - height: 29em; - width: 29em; - right: 1em; - top: 140px; - z-index:1; -} - -// Pull OpenLayers navigation down a bit -#fms_pan_zoom { - top: 190px !important; -} - -// push zoom back over to right -#fms_pan_zoom_zoomin { - left:auto !important; - right:30px; - top:130px !important; -} -#fms_pan_zoom_zoomout { - left:auto !important; - right:30px; - top:174px !important; -} - -.olControlAttribution { - bottom:0.5em !important; - left: auto !important; -} - -#sub_map_links { - left:auto; - bottom:auto; - bottom:2em; - #map_links_toggle { - display:block; - cursor: pointer; - position:absolute; - left:-1em; - width:1em; - height:100%; - background:#000 url(/cobrands/fixmystreet/images/sprite.png) right -4119px no-repeat; - @include border-radius(0.25em 0 0 0.25em); - &:hover { - left:-1.5em; - //use border so we don't have to redefine the background-position - border-right:0.5em solid #000; - } - &.closed { - background-position: right -4159px; - } - } -} -.ie6 #sub_map_links #map_links_toggle { - height:1.75em; - background:#000 url('images/ie_sub_map_links_sprite.gif') center -143px no-repeat; - &.closed { - background-position: center -183px; - } -} - -// log in bit, pokes above the .content div -#user-meta{ - display:block; - position: relative; - max-width: 57em; - margin:0 auto; - p { - @include inline-block; - position:absolute; - top:1em; - height:2em; - padding:0.25em 6em 0.5em 0.5em; - @include box-shadow(rgba(0, 0, 0, 0.6) 0px 0px 4px 1px); - a { - top:0.5em; - right:0.5em; - font-size:0.6875em; - padding:0.5em 0.75em; - line-height:1em; - &:hover { - text-decoration:none; - background:#444; - } - } - } -} -.ie6, .ie7 { - #user-meta { - z-index:1; - p { - top:-2em; - } - } -} -.ie6 #user-meta { - width:57em; //ie6 doesn't like max-width -} - - - -// Wraps around #key-tools box - sticks to the bottom of the screen on desktop -.shadow-wrap { - position:fixed; - z-index:10; //this is just to ensure anythign inside .content that has position set goes sites it - bottom: 0; - width: 29em; - overflow: hidden; - padding-top: 3em; - ul#key-tools { - border-top: 0.25em solid $primary; - margin: 0; - @include box-shadow(-0em 0px 1em 1em #fff); - li { - border:none; - a, input[type=submit] { - font-size: 0.75em; - color:#666; - padding: 0.5em 1.5em 0.5em 0; - text-transform:none; - &.abuse { - background-image:url(/cobrands/fixmystreet/images/sprite.png); - background-position:right -2935px; - } - &.feed { - background-image:url(/cobrands/fixmystreet/images/sprite.png); - background-position:right -3074px; - } - &.chevron { - background-image:url(/cobrands/fixmystreet/images/sprite.png); - background-position:right -3225px; - } - &.hover { - background-image:url(/cobrands/fixmystreet/images/sprite.png); - background-position:right -1876px; - } - } - } - &.singleton { - li { - text-align:right; - a { - padding-right:3em; - } - } - } - } - &.static { - padding:0 0 1em 0; - position: static; - } -} -// The padding is for the fading out when it's fixed positioned, which it isn't in IE6. -.ie6 .shadow-wrap { - padding-top: 0; -} - -// pokes over the RHS with a little triangle -.big-green-banner { - top:auto; - right:-1.25em; - margin-left:-2em; - font-size:1.375em; - padding:1em 3em 1em 1em; - background: $contrast1 url(/cobrands/fixmystreet/images/sprite.png) right -2188px no-repeat; - &:before { - right:0; - left:auto; - top:-0.5em; - position: absolute; - border-top: 0.5em solid transparent; - border-left: 0.5em solid $contrast1_dark; - border-bottom:none; - } - span { - display: block; - font-size: 80%; - padding-top: 0.5em; - } -} -.ie6 .big-green-banner { - background: $contrast1 url(/cobrands/fixmystreet/images/ie_green_chevron.gif) right center no-repeat; -} - -.banner { - // state banners - p { - top:-2.25em; - padding:1em; - &:before { - left:-0.75em; - border-left: 0.75em solid transparent; - border-bottom: 0.75em solid #888; - } - &#fixed { - padding-top:5em; - background-image:url(/cobrands/fixmystreet/images/sprite.png); - background-position:-324px -326px; - background-repeat:no-repeat; - &:before { - border-bottom: 0.75em solid $contrast1_dark; - } - } - } -} -.ie6 .banner p { - top:-1.5em; - &#fixed { - background-image:url(/cobrands/fixmystreet/images/ie_fixed.gif); - background-position:center 0.75em; - } -} - - -// for pulling elements fullwidth regardless -// of .contents' padding -.full-width{ - margin: 0 0 0em -1em; - width: 29em; -} - -/*FORMS*/ -input[type=text], -input[type=password], -input[type=email], -textarea{ - max-width: 25em; -} - -/* form errors */ -div.form-error, -p.form-error { - display:block; -} - -input.form-error, -textarea.form-error { - @include border-radius(0 0 0.25em 0.25em); -} - - -// Report a problem sidebar notes -#report-a-problem-sidebar { - position:absolute; - z-index:-1;//push behind .content, .container resets z-index for this - left:29.5em; - top:9em; - width:15em; - @include box-shadow(rgba(0, 0, 0, 0.6) 0px 0px 4px 1px); - .sidebar-tips { - background:#eeeeee; - padding:1em; - font-size:0.75em; - } - .sidebar-notes { - background:#333333; - padding:1em; - color:#ffffff; - font-size:0.75em; - } -} -.ie6, .ie7 { - #report-a-problem-sidebar, .general-sidebar-notes { - left: 29em; // 0.5em left margin gone on .content in IE6/7, so reduce this accordingly. - } -} - -.no-js .general-sidebar-notes, -.no-js #report-a-problem-sidebar { - position: static; - width: auto; - @include box-shadow(rgba(0, 0, 0, 0), 0, 0, 0); - .sidebar-tips, - .sidebar-notes { - font-size:1em; - } -} - -// More general sidebar notes -.general-sidebar-notes { - position: absolute; - left:29.5em; - width:15em; - z-index: -1; //push behind .content, .container resets z-index for this - @include box-shadow(rgba(0, 0, 0, 0.6) 0px 0px 4px 1px); - p { - background:#eeeeee; - font-size:0.75em; - padding:0.75em; - margin:0; - &.dark { - background:#333333; - color:#ffffff; - } - } -} - -// Frontpage - -body.frontpage { - .table-cell { - .content { - margin: 1em auto 0; - } - } - .nav-wrapper-2{ - height:auto; - } - #site-header{ - height:auto; - } - #site-logo{ - top:3em; - width: 300px; - height: 60px; - background: url('/cobrands/fixmystreet/images/sprite.png') -2px -108px no-repeat; - } - #user-meta { - z-index:10; - p { - top:-4em; - right:0; - color: #fff; - background:none; - @include box-shadow(rgba(0, 0, 0, 0) 0 0 0); - a { - background:#fff; - color:#1a1a1a; - &:hover { - background:#ddd; - } - } - } - } -} -//logo fix -.ie6, .ie7, .ie8 { - body.frontpage { - #site-logo { - position:relative; - width:60em; - margin:0 auto; - } - } -} -.ie6, .ie7 { - body.frontpage { - #site-header { - height:4em; - } - #site-logo { - top:-1em; - } - #user-meta p { - top:-2em; - } - } -} -.ie6 body.frontpage #site-logo { - background:url(/cobrands/fixmystreet/images/ie_front_logo.gif) 0 0 no-repeat; -} - -// big yellow bit full screen width -#front-main { - color: $primary_text; - background: #fff; - margin: 0 auto; - margin-top: 1.5em; - padding: 1em; - max-width: 60em; - #front-main-container { - max-width: 57em; - margin:0 auto; - } - h2 { - font-style:normal; - margin:0; - color:#222; - } - #postcodeForm { - background:none; - overflow:hidden; - padding-bottom: 0; - margin-right:0.5em; - label { - margin:0.5em 0; - } - div { - display:block; - margin:0 auto; - width:20em; - overflow:hidden; - input#pc { - display:block; - float:left; - padding:0.25em 0.5em; - height:2em; - width:17em; - } - input#submit { - display:block; - float:right; - width:3em; - height:2.3em; - padding-top:0.2em; - } - } - } - a { - color: $primary_text; - text-decoration: underline; - &:hover { - text-decoration: none; - } - } - a#geolocate_link { - background:none; - color:#222; - text-decoration: none; - padding-bottom: 0; - &:hover { - text-decoration:underline; - background:none; - } - } -} -.ie7 #front-main { - #postcodeForm { - div { - input#pc { - height:1.5em; - width:16em; - } - } - } -} - -#front-howto { - border-right:1em solid transparent; - #front_stats { - background:none; - color: #222; - border-top:0.25em solid $primary; - padding-top:1em; - div { - big { - color:$primary; - font-size:3.2308em; - } - } - } -} -.ie6, .ie7 { - #front-main { - margin-top: 5.5em; - } - #front_stats { - div { - width:8em; - float:left; - } - } -} - -#front-recently { - border-left:1em solid transparent; -} - -#front-howto h2, -#front-recently h2 { - margin-top:0; -} - - -.ie6, .ie7 { - .tablewrapper { - #front-howto { - margin-right:2%; - } - #front-recently { - margin-left:2%; - } - } -} - - - - -/* MEDIA QUERIES */ -@media only screen and (min-width: 48em) and (max-width: 61em) { - .container { - width: 100%; - } - /*FORMS*/ - input[type=text], - input[type=password], - input[type=email], - textarea{ - width: 95%; - } - - // Remove central positioning of mainmenu and float right. - // Left padding is to ensure no overlap of the site-logo - // Background styling replicates header styling - - #main-nav{ - width: auto; - float:left; - padding-left: 180px; - } - .nav-wrapper { - // width:auto; - .nav-wrapper-2 { - // width:auto; - @include background(linear-gradient(#222, #555 30%, #555 60%, #222)); - } - } - - //Main menu drops below logo and my-soc menu - #main-menu{ - margin-top: 3em; - } - //therefore header needs to open up - #site-header { - height:6em; - } - // Pull OpenLayers navigation down a bit more - #fms_pan_zoom { - top: 7em !important; - } - - //fix the left margin on login bit - #user-meta { - p { - left:1em; - } - } - body.frontpage { - #user-meta { - p { - left:auto; - } - } - } - - //Map becomes percentage width - #map_box{ - left: 32em; - width:auto; - } - - //put the RAP notes into the main copy area - // Note: Also used for the non-JS case. - #report-a-problem-sidebar, - .general-sidebar-notes { - position: static; - width: auto; - @include box-shadow(rgba(0, 0, 0, 0), 0, 0, 0); - .sidebar-tips, - .sidebar-notes { - font-size:1em; - } - } - - //Revert to mobile use of the .full-width class - .full-width{ - width: auto; - margin: 0em -1em 0 -1em; - } - - //make fullpage auto width - body.fullwidthpage .content { - width: auto; - } - - //make twothirdswidthpage nearly as small as main - //.content: just enough to still fit the sidebar in - body.twothirdswidthpage { - .content { - width:30em; - .sticky-sidebar { - left:32em; - top:30em; - aside { - top:19em; - } - } - } - } -} diff --git a/web/cobrands/stevenage/base.scss b/web/cobrands/stevenage/base.scss index b1ceac384..3c3ec4b6d 100644 --- a/web/cobrands/stevenage/base.scss +++ b/web/cobrands/stevenage/base.scss @@ -1,8 +1,13 @@ -@import "h5bp"; +@import "../fixmystreet/h5bp"; @import "colours"; -@import "../fixmystreet/_mixins"; +@import "../fixmystreet/mixins"; @import "compass"; -@import "fmsbase"; +$body-font: 'PTSansRegular', "PT Sans", Verdana, Arial, sans-serif; +$meta-font: $body-font; +$heading-font: 'PTSansCaptionRegular', "PT Sans Caption", Verdana, Arial, sans-serif; + +@import "../fixmystreet/base"; + @import "council_header"; diff --git a/web/cobrands/stevenage/fonts/Museo300-Regular-webfont.eot b/web/cobrands/stevenage/fonts/Museo300-Regular-webfont.eot Binary files differdeleted file mode 100755 index 15be4441c..000000000 --- a/web/cobrands/stevenage/fonts/Museo300-Regular-webfont.eot +++ /dev/null diff --git a/web/cobrands/stevenage/fonts/Museo300-Regular-webfont.svg b/web/cobrands/stevenage/fonts/Museo300-Regular-webfont.svg deleted file mode 100755 index 71109b80b..000000000 --- a/web/cobrands/stevenage/fonts/Museo300-Regular-webfont.svg +++ /dev/null @@ -1,229 +0,0 @@ -<?xml version="1.0" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" > -<svg xmlns="http://www.w3.org/2000/svg"> -<metadata> -This is a custom SVG webfont generated by Fontspring. -</metadata> -<defs> -<font id="Museo300" horiz-adv-x="1241" > -<font-face units-per-em="2048" ascent="1536" descent="-512" /> -<missing-glyph horiz-adv-x="557" /> -<glyph unicode=" " horiz-adv-x="557" /> -<glyph unicode="	" horiz-adv-x="557" /> -<glyph unicode=" " horiz-adv-x="557" /> -<glyph unicode="!" horiz-adv-x="608" d="M227 0v158h158v-158h-158zM231 1440h144l-6 -1063h-131z" /> -<glyph unicode=""" horiz-adv-x="638" d="M135 1114v346h121v-346h-121zM383 1114v346h121v-346h-121z" /> -<glyph unicode="#" horiz-adv-x="1460" d="M84 399l20 115h289l72 401h-289l19 115h290l72 410h125l-72 -410h355l71 410h125l-71 -410h286l-20 -115h-287l-70 -401h285l-18 -115h-287l-70 -399h-125l70 399h-354l-70 -399h-125l70 399h-291zM520 514h352l72 401h-354z" /> -<glyph unicode="$" horiz-adv-x="1089" d="M94 246l107 86q4 -8 14 -23.5t44 -54.5t72 -67.5t101.5 -53t132.5 -24.5q127 0 206 73.5t79 182.5q0 72 -39 128t-101.5 94t-138 72.5t-152.5 73.5t-139.5 86t-101.5 120t-39 167q0 135 100.5 233.5t266.5 118.5v195h117v-191q129 -12 232 -71.5t103 -173.5v-103h-135v68 q0 63 -70.5 106t-170.5 43q-135 0 -215 -64.5t-80 -158.5q0 -80 52 -140.5t132 -96t171 -81t171 -91.5t132 -131t52 -197q0 -150 -103 -262.5t-271 -128.5v-191h-117v191q-80 8 -151.5 38.5t-116.5 67.5t-80 74t-49 61z" /> -<glyph unicode="%" horiz-adv-x="1521" d="M127 1180q0 117 84 200.5t202.5 83.5t203.5 -84t85 -200q0 -119 -83.5 -202t-204.5 -83q-119 0 -203 83t-84 202zM139 0l1098 1440h145l-1095 -1440h-148zM248 1180q0 -72 48 -121t117.5 -49t119 49t49.5 121q0 70 -49.5 120t-119 50t-117.5 -50t-48 -120zM819 258 q0 119 84 203t203 84t204 -84t85 -203q0 -117 -85 -200t-204 -83t-203 83t-84 200zM942 260q0 -72 47 -121t117 -49t119 49t49 121q0 70 -49 120t-119 50t-117 -50t-47 -120z" /> -<glyph unicode="&" horiz-adv-x="1277" d="M94 401q0 127 68.5 233.5t191.5 141.5v4q-8 2 -21.5 8.5t-47 31t-60 57t-48 92t-21.5 131.5q0 162 115.5 263t310.5 101q35 0 76.5 -5t66.5 -11l25 -6l-41 -117q-68 14 -119 14q-125 0 -206 -68.5t-81 -178.5q0 -43 11.5 -82t41 -83t96 -70t160.5 -26h299v199h142v-199 h190v-126h-190v-211q0 -252 -126 -385.5t-347 -133.5q-213 0 -349.5 122t-136.5 304zM240 406q0 -127 92 -212t247.5 -85t243.5 95t88 294v207h-295q-184 0 -280 -80t-96 -219z" /> -<glyph unicode="'" horiz-adv-x="391" d="M135 1114v346h121v-346h-121z" /> -<glyph unicode="(" horiz-adv-x="632" d="M174 680q0 461 221 815h131q-223 -377 -223 -805q0 -473 236 -885h-129q-236 386 -236 875z" /> -<glyph unicode=")" horiz-adv-x="632" d="M94 -195q236 412 236 885q0 428 -224 805h132q221 -360 221 -815q0 -489 -236 -875h-129z" /> -<glyph unicode="*" horiz-adv-x="976" d="M94 1104l41 129l295 -109l-12 316h139l-14 -316l299 107l41 -125l-303 -88v-4l192 -246l-106 -80l-177 260h-4l-174 -258l-108 78l192 246v4z" /> -<glyph unicode="+" d="M86 522v119h473v522h125v-522h471v-119h-471v-522h-125v522h-473z" /> -<glyph unicode="," horiz-adv-x="440" d="M47 -199l117 367h149l-149 -367h-117z" /> -<glyph unicode="-" horiz-adv-x="884" d="M152 518v127h581v-127h-581z" /> -<glyph unicode="." horiz-adv-x="440" d="M141 0v164h158v-164h-158z" /> -<glyph unicode="/" horiz-adv-x="665" d="M6 -86l520 1606h129l-518 -1606h-131z" /> -<glyph unicode="0" horiz-adv-x="1232" d="M121 721q0 743 495 743q180 0 295 -102t159 -262t44 -379q0 -745 -498 -746q-495 1 -495 746zM266 721q0 -612 350.5 -612t350.5 612q0 610 -350.5 610t-350.5 -610z" /> -<glyph unicode="1" horiz-adv-x="974" d="M131 0v127h322v1057l2 80h-4q-14 -31 -72 -86l-154 -154l-90 92l326 324h135v-1313h315v-127h-780z" /> -<glyph unicode="2" horiz-adv-x="1155" d="M86 141q0 147 79 257t190.5 176.5t223 129t190.5 150.5t79 205t-81 193.5t-214 76.5q-106 0 -181 -47t-75 -108v-68h-135v106q0 66 40 116t102.5 79t128 43t124.5 14q201 0 319.5 -115.5t118.5 -287.5q0 -139 -78.5 -245.5t-190.5 -174.5t-223.5 -130t-190.5 -148.5 t-79 -194.5q0 -41 48 -41h602q45 0 45 45v96h133v-143q0 -66 -30 -95.5t-95 -29.5h-721q-72 0 -100.5 32.5t-28.5 108.5z" /> -<glyph unicode="3" horiz-adv-x="1081" d="M53 176l86 107q6 -6 17.5 -18.5t49.5 -42t79 -52.5t104.5 -41t126.5 -18q131 0 228.5 88t97.5 223q0 139 -102.5 221t-247.5 82h-101l-33 84l355 426q35 47 73 80v4q-41 -6 -116 -6h-375q-45 0 -45 -45v-97h-133v144q0 68 27.5 96.5t93.5 28.5h731v-94l-424 -498 q74 -4 146.5 -27.5t142 -71t112.5 -131t43 -194.5q0 -184 -136 -316.5t-339 -132.5q-80 0 -156.5 20.5t-129 50.5t-94.5 59.5t-60 50.5z" /> -<glyph unicode="4" horiz-adv-x="1150" d="M31 397v95l700 948h154v-916h229v-127h-229v-397h-144v397h-710zM197 518q57 6 118 6h428v588l7 139h-5q-35 -59 -73 -110l-400 -529l-75 -90v-4z" /> -<glyph unicode="5" horiz-adv-x="1165" d="M111 180l90 101q4 -6 13 -18.5t40 -41t65.5 -51.5t93 -41t122.5 -18q154 0 256 96t102 239q0 147 -107.5 242.5t-265.5 95.5q-72 0 -141.5 -19.5t-102.5 -39.5l-32 -20l-74 30l61 580q6 68 34 96.5t91 28.5h473q66 0 94.5 -30t28.5 -95v-144h-133v97q0 45 -45 45h-364 q-39 0 -45 -45l-37 -326l-13 -82h4q90 53 218 53q217 0 360 -136t143 -333q0 -195 -144 -332t-361 -137q-80 0 -154 21.5t-121 51.5t-83 59.5t-50 52.5z" /> -<glyph unicode="6" horiz-adv-x="1146" d="M88 633q0 113 22.5 227.5t72.5 224t122 193.5t179.5 135t236.5 51q70 0 136.5 -15t96.5 -30l31 -14l-53 -125q-90 51 -209 51q-143 0 -250.5 -89t-162 -219t-68.5 -284h4q49 82 149.5 128t216.5 46q197 0 323 -128t126 -328q0 -219 -129 -350.5t-324 -131.5 q-231 0 -375.5 185.5t-144.5 472.5zM242 541q0 -154 106.5 -293t257.5 -139q143 0 226 97t83 249q0 150 -89 240.5t-236 90.5q-139 0 -243.5 -77.5t-104.5 -167.5z" /> -<glyph unicode="7" horiz-adv-x="1048" d="M61 1171v144q0 66 29 95.5t94 29.5h850v-99l-712 -1341h-160l626 1180l80 133v4q-37 -4 -108 -4h-518q-45 0 -45 -45v-97h-136z" /> -<glyph unicode="8" horiz-adv-x="1167" d="M96 406q0 70 27 135t64.5 108t74.5 76t64 47l26 14v5q-8 4 -21.5 11t-47 33.5t-59 58.5t-47 84t-21.5 109q0 158 116.5 267.5t317.5 109.5t320.5 -106.5t119.5 -276.5q0 -61 -19.5 -120.5t-48 -100.5t-57 -72.5t-49.5 -46.5l-18 -16v-4q113 -57 172 -134t59 -196 q0 -170 -140.5 -293t-342.5 -123q-201 0 -345.5 117t-144.5 314zM244 412q0 -135 101 -219t241 -84q133 0 234.5 80.5t101.5 203.5q0 102 -68 158.5t-207 112.5q-135 57 -168 57q-55 0 -145 -95t-90 -214zM299 1087q0 -102 68.5 -156t207.5 -106q104 -39 130 -39 q45 0 113.5 94.5t68.5 196.5q0 115 -83 184.5t-214 69.5q-133 0 -212 -70t-79 -174z" /> -<glyph unicode="9" horiz-adv-x="1146" d="M88 983q0 219 128 350t323 131q231 0 375.5 -185t144.5 -472q0 -143 -38 -285.5t-110.5 -267.5t-198.5 -202t-286 -77q-70 0 -136.5 14.5t-96.5 30.5l-31 15l53 125q90 -51 209 -51q143 0 251.5 90t163 220t66.5 283h-4q-49 -82 -150.5 -129t-215.5 -47q-197 0 -322 128 t-125 329zM231 985q0 -150 89.5 -241t236.5 -91q139 0 243.5 78t104.5 168q0 154 -106.5 293t-257.5 139q-143 0 -226.5 -97t-83.5 -249z" /> -<glyph unicode=":" horiz-adv-x="579" d="M211 0v164h158v-164h-158zM211 866v164h158v-164h-158z" /> -<glyph unicode=";" horiz-adv-x="579" d="M111 -199l98 367h149l-131 -367h-116zM211 866v164h158v-164h-158z" /> -<glyph unicode="<" d="M141 530v103l926 414v-138l-752 -325v-4l752 -326v-137z" /> -<glyph unicode="=" d="M143 344v119h955v-119h-955zM143 700v119h955v-119h-955z" /> -<glyph unicode=">" d="M158 117v137l751 326v4l-751 325v138l925 -414v-103z" /> -<glyph unicode="?" horiz-adv-x="882" d="M80 1350q14 12 40.5 31.5t112.5 52t177 32.5q176 0 292.5 -102t116.5 -260q0 -94 -38 -170t-92 -126t-107.5 -97t-91 -109.5t-37.5 -136.5v-88h-140v92q0 90 37 164t89.5 125t105.5 99t90 109.5t37 131.5q0 100 -76 167.5t-193 67.5q-135 -2 -247 -88zM305 0v158h158 v-158h-158z" /> -<glyph unicode="@" horiz-adv-x="1513" d="M84 495.5q0 313.5 214 532.5t515 219q258 0 380 -110.5t122 -276.5v-645h145v-115h-551q-174 0 -291.5 116t-117.5 277.5t116.5 277.5t292.5 116h267q-4 102 -92.5 170.5t-260.5 68.5q-250 0 -423 -185t-173 -445q0 -264 173 -445.5t434 -181.5v-123q-317 0 -533.5 218 t-216.5 531.5zM643 495.5q0 -116.5 81 -198.5t198 -82h254v563h-250q-121 0 -202 -83t-81 -199.5z" /> -<glyph unicode="A" horiz-adv-x="1345" d="M25 0v127h26q57 0 74 45l471 1268h154l471 -1268q16 -45 73 -45h25v-127h-66q-78 0 -110.5 22.5t-59.5 96.5l-125 340h-571l-127 -340q-29 -74 -60.5 -96.5t-107.5 -22.5h-67zM426 584h494l-191 514l-55 186h-4q-31 -119 -56 -186z" /> -<glyph unicode="B" d="M82 1313v127h612q172 0 280.5 -98.5t108.5 -264.5q0 -223 -184 -313v-4q111 -31 176.5 -128t65.5 -229q0 -186 -122 -294.5t-308 -108.5h-371q-66 0 -95.5 29.5t-29.5 95.5v1188h-133zM358 815h334q109 0 176.5 69.5t67.5 182.5q0 111 -66.5 178.5t-179.5 67.5h-332v-498 zM358 172q0 -45 45 -45h308q131 0 205.5 76t74.5 205t-77.5 206.5t-204.5 77.5h-351v-520z" /> -<glyph unicode="C" horiz-adv-x="1421" d="M78 731q0 311 203.5 522t506.5 211q82 0 171.5 -17t174.5 -52t139 -96.5t54 -139.5v-119h-135v80q0 94 -129 151.5t-270 57.5q-242 0 -404 -169t-162 -429t164 -440t408 -180q250 0 438 170l33 32l82 -104q-8 -10 -23.5 -25.5t-69 -55.5t-114 -70.5t-154.5 -56.5 t-194 -26q-313 0 -516 218.5t-203 537.5z" /> -<glyph unicode="D" horiz-adv-x="1464" d="M86 1313v127h578q330 0 526 -191.5t196 -527.5q0 -340 -196.5 -530.5t-525.5 -190.5h-320q-66 0 -95.5 29.5t-29.5 95.5v1188h-133zM362 172q0 -45 46 -45h241q270 0 429 154.5t159 439.5q0 283 -158.5 437.5t-429.5 154.5h-287v-1141z" /> -<glyph unicode="E" horiz-adv-x="1142" d="M86 1313v127h823q66 0 95.5 -30t29.5 -95v-144h-135v97q0 45 -45 45h-492v-525h541v-126h-541v-490q0 -45 46 -45h505q45 0 45 45v96h134v-143q0 -66 -30 -95.5t-95 -29.5h-623q-66 0 -95.5 29.5t-29.5 95.5v1188h-133z" /> -<glyph unicode="F" horiz-adv-x="1021" d="M86 1313v127h766q66 0 94.5 -30t28.5 -95v-144h-133v97q0 45 -45 45h-435v-541h523v-127h-523v-645h-143v1313h-133z" /> -<glyph unicode="G" horiz-adv-x="1495" d="M80 723q0 311 207 526t512 215q285 0 475 -151l29 -25l-84 -106q-18 16 -52 40.5t-143 65.5t-223 41q-244 0 -408 -173t-164 -433q0 -264 162 -438t408 -174q80 0 155.5 21.5t128 52t92 62.5t58.5 52l20 23v178q0 45 -45 45h-88v127h144q66 0 95.5 -30t29.5 -95v-547 h-132v109l3 61h-5q-6 -8 -19 -21.5t-58 -46t-96.5 -58.5t-132.5 -47.5t-165 -21.5q-297 0 -500.5 213t-203.5 535z" /> -<glyph unicode="H" horiz-adv-x="1550" d="M86 1313v127h152q66 0 95 -30t29 -95v-531h828v531q0 66 28.5 95.5t94.5 29.5h153v-127h-88q-45 0 -45 -45v-1268h-143v657h-828v-657h-143v1268q0 45 -45 45h-88z" /> -<glyph unicode="I" horiz-adv-x="600" d="M94 0v127h135v1186h-135v127h412v-127h-137v-1186h137v-127h-412z" /> -<glyph unicode="J" horiz-adv-x="1034" d="M49 403v58h144v-49q0 -158 76.5 -229.5t187.5 -71.5q109 0 184.5 71.5t75.5 225.5v860q0 45 -45 45h-357v127h420q66 0 95.5 -30t29.5 -95v-912q0 -217 -118.5 -322.5t-286.5 -105.5t-287 106.5t-119 321.5z" /> -<glyph unicode="K" horiz-adv-x="1208" d="M86 1313v127h152q66 0 95 -30t29 -95v-500h173q90 0 120 51l349 574h163l-370 -604q-37 -59 -74 -80v-4q35 -12 70 -82l249 -496q14 -31 37 -39t68 -8h41v-127h-76q-90 0 -127 19.5t-72 89.5l-262 526q-25 53 -131 53h-158v-688h-143v1268q0 45 -45 45h-88z" /> -<glyph unicode="L" horiz-adv-x="1085" d="M86 1313v127h152q66 0 95 -30t29 -95v-1143q0 -45 46 -45h477q45 0 45 45v96h135v-143q0 -66 -29.5 -95.5t-95.5 -29.5h-596q-66 0 -95.5 29.5t-29.5 95.5v1143q0 45 -45 45h-88z" /> -<glyph unicode="M" horiz-adv-x="1730" d="M45 0v127h76q43 0 45 45l100 1268h146l381 -838l71 -170h4q37 96 70 170l381 838h145l101 -1268q2 -45 45 -45h78v-127h-140q-66 0 -93.5 28.5t-31.5 96.5l-67 874l-6 201h-4q-39 -127 -74 -201l-342 -731h-129l-340 731l-76 205h-4q0 -127 -6 -205l-68 -874 q-4 -68 -31.5 -96.5t-93.5 -28.5h-137z" /> -<glyph unicode="N" horiz-adv-x="1556" d="M86 0v127h88q45 0 45 45v1268h131l735 -1026l117 -189h4q-10 113 -10 189v901q0 66 29.5 95.5t95.5 29.5h152v-127h-89q-45 0 -45 -45v-1268h-131l-735 1026l-119 186h-4q12 -111 12 -186v-901q0 -66 -29.5 -95.5t-94.5 -29.5h-152z" /> -<glyph unicode="O" horiz-adv-x="1619" d="M78 729q0 309 213 522t520 213t520 -213t213 -522q0 -315 -214 -534.5t-519 -219.5q-307 0 -520 219.5t-213 534.5zM227 729q0 -260 170 -439t414 -179q242 0 413 179t171 439q0 254 -170 427t-414 173t-414 -173t-170 -427z" /> -<glyph unicode="P" horiz-adv-x="1185" d="M86 1313v127h608q195 0 320 -119t125 -315q0 -199 -125 -320t-320 -121h-332v-565h-143v1313h-133zM362 692h314q143 0 229 84t86 230q0 143 -85 225t-228 82h-316v-621z" /> -<glyph unicode="Q" horiz-adv-x="1619" d="M78 729q0 309 212 522t517 213q311 0 524 -213t213 -522q0 -283 -180 -496l176 -176l-88 -92l-176 178q-197 -168 -469 -168q-305 0 -517 219.5t-212 534.5zM227 729q0 -260 168 -439t412 -179q205 0 356 120l13 11l-172 174l88 92l170 -176q133 170 133 397 q0 254 -169 426t-419 172q-246 0 -413 -172t-167 -426z" /> -<glyph unicode="R" horiz-adv-x="1239" d="M86 1313v127h610q182 0 298 -111.5t116 -298.5q0 -158 -82 -259t-197 -126v-4q29 -16 50 -57l206 -410q14 -31 37 -39t66 -8h29v-127h-64q-90 0 -127 19.5t-72 89.5l-206 411q-29 55 -56.5 70.5t-89.5 15.5h-242v-606h-143v1313h-133zM362 733h320q129 0 204 79t75 214 q0 133 -75 210t-202 77h-322v-580z" /> -<glyph unicode="S" horiz-adv-x="1060" d="M76 180l88 105q6 -6 17.5 -18.5t48 -43t77.5 -53.5t103.5 -42t126.5 -19q121 0 202.5 71.5t81.5 184.5q0 98 -72.5 167.5t-177 116.5t-210 97.5t-178 138.5t-72.5 211q0 154 122.5 261t317.5 107q82 0 165 -20.5t153.5 -79.5t70.5 -147v-103h-135v68q0 63 -75 106 t-177 43q-135 0 -215 -67.5t-80 -163.5q0 -59 30.5 -107.5t81 -80t114 -64.5t130 -59.5t130 -65.5t113.5 -83t81 -112.5t31 -154.5q0 -168 -120 -283t-317 -115q-82 0 -159.5 21.5t-128.5 51.5t-91 59.5t-59 52.5z" /> -<glyph unicode="T" horiz-adv-x="1269" d="M31 1171v152q0 66 25.5 91.5t90.5 25.5h975q66 0 91.5 -25.5t25.5 -91.5v-152h-133v97q0 45 -45 45h-354v-1313h-144v1313h-356q-45 0 -45 -45v-97h-131z" /> -<glyph unicode="U" horiz-adv-x="1468" d="M70 1313v127h151q66 0 95.5 -30t29.5 -95v-815q0 -180 105.5 -284.5t281.5 -104.5q178 0 283.5 105.5t105.5 287.5v811q0 66 30 95.5t95 29.5h152v-127h-88q-45 0 -45 -45v-774q0 -233 -146.5 -376t-384 -143t-385 142.5t-147.5 376.5v774q0 45 -45 45h-88z" /> -<glyph unicode="V" horiz-adv-x="1337" d="M25 1313v127h63q78 0 109.5 -22.5t58.5 -96.5l354 -969l56 -186h4q29 113 55 186l354 969q27 74 59.5 96.5t110.5 22.5h62v-127h-19q-57 0 -73 -45l-474 -1268h-153l-473 1268q-16 45 -74 45h-20z" /> -<glyph unicode="W" horiz-adv-x="1935" d="M35 1313v127h63q82 0 119 -23.5t55 -95.5l250 -993l31 -154h4q18 80 39 154l317 1106h142l288 -1106l33 -154h4q14 80 33 154l250 993q18 72 55 95.5t119 23.5h64v-127h-23q-63 0 -76 -45l-332 -1268h-170l-268 1001l-47 213h-4q-25 -119 -51 -210l-295 -1004h-170 l-330 1268q-12 45 -76 45h-24z" /> -<glyph unicode="X" horiz-adv-x="1167" d="M31 0l458 752l-311 508q-33 53 -102 53h-43v127h76q78 0 116.5 -22.5t81.5 -92.5l185 -309l92 -164h4q43 90 88 164l184 309q43 70 82 92.5t117 22.5h76v-127h-43q-70 0 -103 -53l-313 -508l461 -752h-164l-299 496l-92 157h-4q-41 -86 -86 -159l-297 -494h-164z" /> -<glyph unicode="Y" horiz-adv-x="1212" d="M20 1313v127h56q76 0 113.5 -20.5t82.5 -94.5l244 -407l88 -162h4q43 86 88 162l244 407q45 74 83 94.5t114 20.5h55v-127h-33q-63 0 -94 -53l-387 -633v-627h-143v627l-385 633q-33 53 -97 53h-33z" /> -<glyph unicode="Z" horiz-adv-x="1177" d="M39 0v100l772 1082q25 33 50.5 65.5t39.5 48.5l14 17v4q-35 -4 -104 -4h-573q-45 0 -45 -45v-97h-134v144q0 66 30 95.5t95 29.5h908v-101l-770 -1081q-25 -33 -51.5 -65.5t-41.5 -49.5l-14 -16v-4q35 4 107 4h620q45 0 45 45v96h133v-143q0 -66 -29.5 -95.5t-95.5 -29.5 h-956z" /> -<glyph unicode="[" horiz-adv-x="620" d="M207 -70v1440q0 66 29.5 95.5t95.5 29.5h151v-115h-102q-45 0 -45 -45v-1370q0 -45 45 -45h102v-115h-151q-66 0 -95.5 29.5t-29.5 95.5z" /> -<glyph unicode="\" horiz-adv-x="649" d="M10 1520h131l518 -1606h-129z" /> -<glyph unicode="]" horiz-adv-x="620" d="M137 -80h103q45 0 45 45v1370q0 45 -45 45h-103v115h152q66 0 95.5 -29.5t29.5 -95.5v-1440q0 -66 -30 -95.5t-95 -29.5h-152v115z" /> -<glyph unicode="^" d="M150 512l405 928h96l406 -928h-133l-320 758l-319 -758h-135z" /> -<glyph unicode="_" horiz-adv-x="1077" d="M10 0h1057v-119h-1057v119z" /> -<glyph unicode="`" horiz-adv-x="737" d="M190 1784h156l143 -244h-120z" /> -<glyph unicode="a" horiz-adv-x="1083" d="M82 281q0 354 631 354h57v12q0 160 -61.5 225.5t-204.5 65.5q-63 0 -132 -20.5t-69 -69.5v-66h-133v99q0 49 39 87t97.5 55t108.5 24.5t91 7.5q227 0 315 -104.5t88 -291.5v-493q0 -45 45 -45h86v-121h-141q-66 0 -94.5 29.5t-28.5 93.5l2 76h-4q2 0 -9 -22.5t-37 -56.5 t-62.5 -67t-99 -55.5t-134.5 -22.5q-141 0 -245.5 80.5t-104.5 225.5zM225 289q0 -78 60.5 -136.5t169.5 -58.5q139 0 227 119t88 264v47h-59q-55 0 -93 -2t-102.5 -8t-109 -21.5t-89.5 -40t-68.5 -66.5t-23.5 -97z" /> -<glyph unicode="b" horiz-adv-x="1196" d="M41 1319v121h145q66 0 95.5 -30t29.5 -95v-373l-4 -84h4q4 8 11.5 21.5t36 47.5t65.5 59.5t100.5 47t137.5 21.5q205 0 326.5 -149.5t121.5 -391.5t-130 -390.5t-335 -148.5q-203 0 -315 162l-23 37h-4q4 -35 4 -84v-90h-135v1274q0 45 -45 45h-86zM307 512 q0 -168 86 -291t242 -123q141 0 236.5 113t95.5 303q0 186 -91.5 300t-234.5 114q-141 0 -237.5 -104.5t-96.5 -311.5z" /> -<glyph unicode="c" horiz-adv-x="1081" d="M82 514q0 236 155.5 388.5t387.5 152.5q49 0 107.5 -11.5t118.5 -34t100 -68.5t40 -105v-93h-131v60q0 59 -79 93t-156 34q-170 0 -285 -116t-115 -300t118 -298t286 -114q186 0 317 131l15 15l65 -105q-6 -6 -16.5 -17t-49 -41t-81.5 -51.5t-113 -40t-143 -18.5 q-233 0 -387 150.5t-154 388.5z" /> -<glyph unicode="d" horiz-adv-x="1204" d="M86 516q0 242 129 390.5t334 148.5q207 0 315 -158l21 -35h4q-4 35 -4 78v334q0 45 -45 45h-86v121h145q66 0 95.5 -30t29.5 -95v-1149q0 -45 45 -45h86v-121h-143q-123 0 -123 115l4 65h-4l-11 -22q-7 -14 -36 -49t-66 -62t-101.5 -49.5t-139.5 -22.5q-205 0 -327 149.5 t-122 391.5zM229 516.5q0 -188.5 90.5 -302.5t235.5 -114q141 0 237.5 104.5t96.5 311.5q0 170 -86 292t-242 122q-141 0 -236.5 -112.5t-95.5 -301z" /> -<glyph unicode="e" horiz-adv-x="1122" d="M82 514q0 246 146.5 393.5t361.5 147.5q205 0 318.5 -136.5t113.5 -338.5l-4 -70h-791q2 -188 118 -299t282 -111q170 0 299 117l10 10l68 -104q-16 -16 -48 -41t-131.5 -66t-203.5 -41q-231 0 -385 151.5t-154 387.5zM233 621h646q-6 154 -88 235.5t-203 81.5 q-133 0 -231.5 -83.5t-123.5 -233.5z" /> -<glyph unicode="f" horiz-adv-x="624" d="M51 913v117h129v37q0 119 38 202t98.5 118.5t112.5 49t106 13.5l63 -4v-125q-18 4 -49 4q-37 0 -70 -9t-72.5 -32.5t-63.5 -80t-24 -136.5v-37h263v-117h-263v-913h-139v913h-129z" /> -<glyph unicode="g" horiz-adv-x="1185" d="M86 534.5q0 233.5 121 377t325 143.5q78 0 141.5 -18.5t99.5 -44t60.5 -51.5t32.5 -44l8 -18h5v39q0 113 116 112h144v-121h-84q-45 0 -45 -45v-839q0 -229 -142.5 -342t-353.5 -113q-176 0 -336 82l53 117q127 -72 279 -72q162 0 261 80t99 243v91l2 73h-4 q-96 -178 -323 -178q-207 0 -333 147.5t-126 381zM229 536.5q0 -184.5 92.5 -295t243.5 -110.5q137 0 222 95.5t85 308.5q0 393 -325 393q-150 0 -234 -103.5t-84 -288z" /> -<glyph unicode="h" horiz-adv-x="1239" d="M41 1319v121h145q66 0 95.5 -29t29.5 -92v-436l-4 -84h4q37 92 144.5 174t263.5 82q186 0 266 -100.5t80 -299.5v-489q0 -45 45 -45h86v-121h-145q-66 0 -95.5 29.5t-29.5 95.5v493q0 70 -7.5 118t-30 94.5t-69.5 70t-119 23.5q-131 0 -234.5 -82t-137.5 -211 q-16 -55 -17 -137v-494h-139v1274q0 45 -45 45h-86z" /> -<glyph unicode="i" horiz-adv-x="514" d="M57 909v121h146q66 0 95.5 -29.5t29.5 -95.5v-739q0 -45 45 -45h86v-121h-146q-66 0 -95.5 29.5t-29.5 95.5v739q0 45 -45 45h-86zM184 1264v176h135v-176h-135z" /> -<glyph unicode="j" horiz-adv-x="548" d="M-43 -295q18 -2 45 -2q37 0 72 9t74.5 34t63.5 82t24 139v897q0 45 -46 45h-86v121h146q66 0 95.5 -29.5t29.5 -95.5v-944q0 -121 -38 -203t-99.5 -117.5t-113.5 -49t-108 -13.5l-59 6v121zM233 1264v176h134v-176h-134z" /> -<glyph unicode="k" horiz-adv-x="1019" d="M41 1319v121h145q68 0 96.5 -27t28.5 -92v-684h107q78 0 117 49l264 344h170l-297 -377q-23 -29 -42.5 -47t-27.5 -22l-8 -4v-5q31 -14 63 -75l187 -334q14 -27 33.5 -36t60.5 -9h55v-121h-96q-78 0 -110.5 19.5t-67.5 82.5l-205 369q-25 45 -108 45h-95v-516h-139v1274 q0 45 -45 45h-86z" /> -<glyph unicode="l" horiz-adv-x="501" d="M45 1319v121h145q66 0 95.5 -30t29.5 -95v-1149q0 -45 45 -45h86v-121h-145q-66 0 -95.5 29.5t-29.5 95.5v1149q0 45 -45 45h-86z" /> -<glyph unicode="m" horiz-adv-x="1906" d="M47 909v121h143q125 0 125 -115v-47l-4 -73h4q39 106 146.5 183t226.5 77q272 0 320 -258h4q43 109 147.5 183.5t231.5 74.5q182 0 262 -100.5t80 -299.5v-489q0 -45 45 -45h86v-121h-146q-66 0 -95.5 29.5t-29.5 95.5v496q0 145 -47 226t-176 81q-113 0 -203 -86 t-123 -205q-18 -57 -18 -150v-487h-139v621q0 68 -7.5 114.5t-28 95t-66.5 73t-115 24.5q-121 0 -211 -88t-125 -215q-16 -57 -17 -138v-487h-139v864q0 45 -45 45h-86z" /> -<glyph unicode="n" horiz-adv-x="1245" d="M47 909v121h143q125 0 125 -115v-47l-4 -73h4q37 94 142.5 177t267.5 83q186 0 266 -100.5t80 -299.5v-489q0 -45 45 -45h86v-121h-145q-66 0 -95.5 29.5t-29.5 95.5v493q0 145 -44 225.5t-179 80.5q-131 0 -235.5 -81t-139.5 -210q-16 -57 -17 -139v-494h-139v864 q0 45 -45 45h-86z" /> -<glyph unicode="o" horiz-adv-x="1251" d="M82 520q0 227 158.5 381t384.5 154q227 0 385.5 -153.5t158.5 -381.5q0 -231 -158.5 -388t-383.5 -157q-227 0 -386 157t-159 388zM225 520q0 -178 117 -299t285 -121q166 0 282.5 121t116.5 299q0 174 -116.5 291t-282.5 117q-168 0 -285 -117t-117 -291z" /> -<glyph unicode="p" horiz-adv-x="1202" d="M47 909v121h141q123 0 123 -108l-2 -70h4q4 8 11.5 21.5t36 49t64.5 62.5t101.5 48.5t141.5 21.5q205 0 326.5 -149.5t121.5 -391.5t-129 -390.5t-332 -148.5q-70 0 -131 20.5t-97 49.5t-62.5 56.5t-36.5 48.5l-11 20h-4q4 -37 4 -90v-490h-139v1274q0 45 -45 45h-86z M313 512q0 -168 87 -291t241 -123q141 0 236.5 113t95.5 303q0 188 -90 301t-236 113q-141 0 -237.5 -104.5t-96.5 -311.5z" /> -<glyph unicode="q" horiz-adv-x="1204" d="M88 516q0 242 129 390.5t334 148.5q70 0 131 -20.5t98 -50.5t63.5 -58.5t37.5 -48.5l10 -21h4q-2 29 -2 68q0 106 123 106h141v-121h-86q-45 0 -45 -45v-1274h-139v494l4 90h-4q-4 -8 -11.5 -21.5t-36 -47t-65.5 -60.5t-100.5 -48.5t-136.5 -21.5q-205 0 -327 149.5 t-122 391.5zM229 516.5q0 -188.5 91.5 -302.5t236.5 -114q141 0 237.5 104.5t96.5 311.5q0 170 -86 292t-242 122q-141 0 -237.5 -112.5t-96.5 -301z" /> -<glyph unicode="r" horiz-adv-x="741" d="M47 909v121h143q125 0 125 -117v-69l-4 -78h4q39 123 124 198.5t202 75.5l55 -6v-137q-25 4 -51 4q-106 0 -185 -73.5t-114 -192.5q-29 -92 -29 -201v-434h-139v864q0 45 -45 45h-86z" /> -<glyph unicode="s" horiz-adv-x="901" d="M59 156l80 96q4 -6 13.5 -16.5t40 -38t64.5 -48t88 -37t112 -16.5q92 0 154.5 43t62.5 121q0 61 -59.5 106.5t-144.5 78t-170 69.5t-144.5 103.5t-59.5 158.5q0 135 102.5 207t264.5 72q45 0 94 -9.5t100.5 -29t85 -58t33.5 -90.5v-88h-131v49q0 51 -57.5 78t-120.5 27 q-229 0 -229 -150q0 -63 59 -108t144 -77t170 -68.5t144.5 -104.5t59.5 -162q0 -127 -102.5 -208t-257.5 -81q-227 0 -373 154z" /> -<glyph unicode="t" horiz-adv-x="686" d="M55 913v117h138v285h137v-285h258v-117h-258v-524q0 -70 17.5 -121t42 -79.5t57 -45t59 -21.5t55.5 -5l47 4v-125q-25 -4 -59 -4q-43 0 -84 6t-93.5 29.5t-90 62.5t-64.5 112.5t-27 172.5v538h-135z" /> -<glyph unicode="u" horiz-adv-x="1234" d="M43 909v121h145q66 0 95.5 -28.5t29.5 -92.5v-497q0 -145 45 -225.5t181 -80.5q168 0 273.5 128t105.5 303v493h139v-864q0 -45 45 -45h86v-121h-141q-125 0 -125 115v47l4 74h-4q-39 -94 -144.5 -177.5t-257.5 -83.5q-180 0 -263 98.5t-83 301.5v489q0 45 -45 45h-86z " /> -<glyph unicode="v" horiz-adv-x="1060" d="M29 909v121h55q74 0 105.5 -21.5t58.5 -90.5l248 -644l34 -120h5q16 70 34 120l248 644q27 70 58.5 91t103.5 21h53v-121h-18q-55 0 -72 -47l-336 -862h-151l-336 862q-18 47 -72 47h-18z" /> -<glyph unicode="w" horiz-adv-x="1708" d="M20 909v121h72q76 0 107.5 -21.5t54.5 -93.5l211 -653l31 -110h4q16 61 32 110l252 764h140l252 -764l32 -110h4q12 59 29 110l213 653q23 72 54.5 93.5t107.5 21.5h72v-121h-29q-55 0 -72 -47l-295 -862h-153l-252 733l-31 111h-4q-14 -59 -33 -111l-250 -733h-155 l-295 862q-16 47 -72 47h-27z" /> -<glyph unicode="x" horiz-adv-x="976" d="M37 909v121h76q78 0 111.5 -20.5t80.5 -91.5l148 -230l34 -61h5q18 35 32 61l150 230q47 72 80.5 92t111.5 20h74v-121h-41q-70 0 -96 -41l-223 -331l360 -537h-164l-252 383l-32 57h-5q-16 -29 -34 -57l-252 -383h-162l358 537l-223 329q-31 43 -94 43h-43z" /> -<glyph unicode="y" horiz-adv-x="1103" d="M16 -330l66 103q0 -4 18.5 -21.5t57.5 -37t78 -19.5q121 0 190 168l61 141l-362 858q-20 47 -72 47h-20v121h63q70 0 99.5 -21.5t58.5 -90.5l264 -644l37 -110h4q14 59 35 110l254 644q27 70 57.5 91t102.5 21h63v-121h-20q-53 0 -72 -47l-444 -1077 q-41 -100 -118 -157.5t-177 -57.5q-133 0 -220 94z" /> -<glyph unicode="z" horiz-adv-x="1021" d="M80 0v90l579 723l82 94v4q-35 -4 -102 -4h-377q-45 0 -45 -45v-80h-131v123q0 66 29.5 95.5t95.5 29.5h715v-92l-578 -721l-86 -94v-4q37 4 105 4h426q45 0 45 45v80h131v-123q0 -66 -30 -95.5t-95 -29.5h-764z" /> -<glyph unicode="{" horiz-adv-x="667" d="M68 598v127q6 0 18 3t42 18.5t53.5 38t42 69.5t18.5 107v167q0 96 24.5 168t58 109t80 58.5t78 26.5t64.5 5h31v-115h-19q-27 0 -52.5 -7t-60 -30.5t-55 -79t-20.5 -139.5v-200q0 -55 -16.5 -103.5t-41 -76t-49 -47t-41.5 -25.5l-16 -8v-5q6 -2 17.5 -7t40 -24.5t50 -46 t39 -74.5t17.5 -108v-225q0 -82 21.5 -138t55 -79t59 -31t52.5 -8h19v-115q-12 -2 -31 -2q-33 0 -64.5 5.5t-78 28t-80 59t-58 108.5t-24.5 168v195q0 59 -18.5 105t-43 69.5t-50.5 38t-44 16.5z" /> -<glyph unicode="|" horiz-adv-x="583" d="M227 -322v1936h129v-1936h-129z" /> -<glyph unicode="}" horiz-adv-x="667" d="M90 -82h21q25 0 50 8t59 31t55.5 79t21.5 138v225q0 59 16.5 107.5t41 75t49 46t40.5 25.5l17 6v5q-6 2 -17.5 7t-40 26.5t-50 48t-39 74.5t-17.5 104v200q0 84 -20.5 139.5t-55.5 79t-59.5 30.5t-50.5 7h-21v115h33q31 0 62.5 -5t77.5 -27.5t80 -58.5t58.5 -107.5 t24.5 -168.5v-167q0 -174 137 -226l37 -10v-127q-6 0 -18.5 -3t-42 -18.5t-53 -38t-42 -68.5t-18.5 -105v-195q0 -96 -24.5 -168t-58.5 -108.5t-80 -59t-77.5 -28t-62.5 -5.5l-33 2v115z" /> -<glyph unicode="~" d="M137 428q0 162 69.5 239.5t190.5 77.5q61 0 110.5 -21.5t81.5 -53t61.5 -63.5t68.5 -53.5t86 -21.5q82 0 113.5 63.5t31.5 141.5h121q0 -162 -69.5 -239.5t-190.5 -77.5q-76 0 -134.5 33.5t-89 72.5t-78.5 73t-106 34q-82 0 -113.5 -63.5t-31.5 -141.5h-121z" /> -<glyph unicode="¡" horiz-adv-x="608" d="M223 872v158h158v-158h-158zM231 -410l7 1063h131l6 -1063h-144z" /> -<glyph unicode="¢" horiz-adv-x="1116" d="M113 720.5q0 231.5 108.5 390.5t302.5 181v228h117v-228q248 -29 367 -303l-131 -49q-94 221 -287 221q-162 0 -247 -123t-85 -317q0 -197 84 -318.5t248 -121.5q193 0 287 221l131 -51q-125 -281 -367 -304v-227h-117v227q-195 23 -303 182.5t-108 391z" /> -<glyph unicode="£" horiz-adv-x="1191" d="M111 0v127h129v541h-93v112h93v305q0 162 119.5 270.5t302.5 108.5q178 0 313 -110l8 -6l-88 -103q-98 86 -233 86q-129 0 -204 -72.5t-75 -181.5v-297h391v-112h-391v-541h539q45 0 45 45v96h133v-143q0 -66 -30 -95.5t-95 -29.5h-864z" /> -<glyph unicode="¥" horiz-adv-x="1243" d="M35 1313v127h49q78 0 119 -21.5t84 -93.5l243 -407l88 -160h5q43 84 88 160l245 407q41 72 83 93.5t120 21.5h47v-127h-24q-72 0 -99 -45l-266 -439v-4h205v-104h-272l-56 -94v-84h328v-107h-328v-436h-143v436h-332v107h332v84l-59 94h-281v104h215v4l-268 439 q-27 45 -99 45h-24z" /> -<glyph unicode="§" horiz-adv-x="849" d="M123 -41l72 98q72 -61 168 -61t159.5 60.5t63.5 162.5q0 35 -8 66l-134 878h123l140 -889q8 -53 8 -71q0 -143 -98.5 -236.5t-256.5 -93.5q-137 2 -237 86zM150 1135q0 143 97 236t255 93q137 -2 237 -86l-71 -96q-70 59 -166 59t-161 -58t-65 -161q0 -33 9 -63l135 -885 h-123l-139 889q-8 33 -8 72z" /> -<glyph unicode="¨" horiz-adv-x="1009" d="M322 1608v176h120v-176h-120zM629 1608v176h121v-176h-121z" /> -<glyph unicode="©" horiz-adv-x="1624" d="M84 721q0 309 212 526t511 217q305 0 519 -217t214 -526q0 -313 -213 -529.5t-520 -216.5q-301 0 -512 217.5t-211 528.5zM205 721q0 -268 174 -451.5t428 -183.5q260 0 437 183.5t177 451.5q0 266 -177 449.5t-437 183.5q-254 0 -428 -183.5t-174 -449.5zM406 717 q0 172 114.5 297t306.5 125q63 0 121 -19.5t94.5 -47.5t65.5 -56.5t41 -48.5l12 -19l-94 -63l-10 15q-6 9 -28.5 33.5t-48.5 43t-66 34t-83 15.5q-141 0 -223 -90t-82 -217t81 -217t224 -90q135 0 226 127l10 14l94 -64q-4 -8 -13 -20t-40 -45t-66.5 -58.5t-93 -46 t-121.5 -20.5q-195 0 -308 124t-113 294z" /> -<glyph unicode="ª" horiz-adv-x="847" d="M119 541v96h620v-96h-620zM123 979q0 225 389 225h27q-2 86 -35 122t-111 36q-106 0 -106 -41v-49h-109v80q0 41 45 67.5t89 33.5t83 7q143 0 199.5 -66.5t56.5 -185.5v-290q0 -18 19 -19h59v-104h-96q-84 0 -86 79v25h-4q-6 -12 -18.5 -31.5t-62.5 -52.5t-114 -33 q-92 0 -158.5 53.5t-66.5 143.5zM240 985q0 -43 32.5 -73.5t89.5 -30.5q80 0 127.5 68.5t51.5 164.5h-25q-276 0 -276 -129z" /> -<glyph unicode="«" horiz-adv-x="1069" d="M78 578l336 421h149l-336 -421l336 -420h-149zM444 578l336 421h152l-336 -421l336 -420h-152z" /> -<glyph unicode="¬" d="M143 700v119h955v-495h-125v376h-830z" /> -<glyph unicode="­" horiz-adv-x="884" d="M152 518v127h581v-127h-581z" /> -<glyph unicode="®" horiz-adv-x="1624" d="M84 721q0 309 212 526t511 217q305 0 519 -217t214 -526q0 -313 -213 -529.5t-520 -216.5q-301 0 -512 217.5t-211 528.5zM205 721q0 -268 174 -451.5t428 -183.5q260 0 437 183.5t177 451.5q0 266 -177 449.5t-437 183.5q-254 0 -428 -183.5t-174 -449.5zM492 1024v96 h358q106 0 173 -65.5t67 -171.5q0 -84 -44.5 -140.5t-105.5 -70.5v-4q23 -8 41 -43l92 -185q12 -27 55 -26h21v-92h-59q-47 0 -71 11t-44 50l-111 217q-25 45 -73 45h-111v-323h-115v702h-73zM680 735h149q66 0 104 39t38 109q0 68 -38 104.5t-104 36.5h-149v-289z" /> -<glyph unicode="¯" horiz-adv-x="944" d="M229 1608v110h504v-110h-504z" /> -<glyph unicode="ˉ" horiz-adv-x="944" d="M229 1608v110h504v-110h-504z" /> -<glyph unicode="°" horiz-adv-x="784" d="M104 1178q0 117 84 200.5t203 83.5t204 -84t85 -200q0 -119 -84 -202t-205 -83q-119 0 -203 83t-84 202zM227 1178q0 -72 47.5 -121t117 -49t118.5 49t49 121q0 70 -49 120t-118.5 50t-117 -50t-47.5 -120z" /> -<glyph unicode="±" d="M86 522v119h473v522h125v-522h471v-119h-471v-522h-125v522h-473zM123 -213h995v-119h-995v119z" /> -<glyph unicode="²" horiz-adv-x="837" d="M104 645q0 63 20.5 113.5t64.5 91.5t77 62.5t97 58.5q66 37 100.5 60.5t67 68.5t32.5 98q0 63 -44 105.5t-118 42.5q-57 0 -98 -25t-41 -57v-54h-110v80q0 80 82.5 123t166.5 43q131 0 206 -72.5t75 -185.5q0 -61 -20.5 -109.5t-68.5 -89.5t-77 -59t-96.5 -57t-100 -61.5 t-65.5 -66.5t-33 -93q0 -12 19 -13h358q12 0 12 15v71h111v-102q0 -47 -21.5 -68.5t-68.5 -21.5h-434q-51 0 -72 22.5t-21 79.5z" /> -<glyph unicode="³" horiz-adv-x="837" d="M102 674l82 80q10 -12 29.5 -32t78 -52.5t116.5 -32.5q72 0 126 50t54 126t-56.5 121t-136.5 45h-71l-21 70l197 239l47 49v4q-35 -6 -74 -6h-194q-20 0 -21 -22v-58h-111v88q0 53 20.5 75t76.5 22h452v-80l-241 -283q96 -8 174 -78.5t78 -187.5q0 -123 -89.5 -204 t-211.5 -81q-80 0 -156 37t-111 74z" /> -<glyph unicode="´" horiz-adv-x="759" d="M236 1540l143 244h156l-179 -244h-120z" /> -<glyph unicode="µ" horiz-adv-x="1234" d="M43 909v121h145q66 0 95.5 -28.5t29.5 -92.5v-497q0 -145 45 -225.5t181 -80.5q168 0 273.5 128t105.5 303v493h139v-864q0 -45 45 -45h86v-121h-141q-125 0 -125 115v47l4 74h-6q-4 -10 -12.5 -28t-42.5 -63t-74.5 -79.5t-113.5 -62.5t-157 -28q-76 0 -133 21.5 t-76 44.5l-18 20h-4q14 -104 14 -155v-316h-129v1274q0 45 -45 45h-86z" /> -<glyph unicode="μ" horiz-adv-x="1234" d="M43 909v121h145q66 0 95.5 -28.5t29.5 -92.5v-497q0 -145 45 -225.5t181 -80.5q168 0 273.5 128t105.5 303v493h139v-864q0 -45 45 -45h86v-121h-141q-125 0 -125 115v47l4 74h-6q-4 -10 -12.5 -28t-42.5 -63t-74.5 -79.5t-113.5 -62.5t-157 -28q-76 0 -133 21.5 t-76 44.5l-18 20h-4q14 -104 14 -155v-316h-129v1274q0 45 -45 45h-86z" /> -<glyph unicode="¶" horiz-adv-x="1175" d="M88 968.5q0 198.5 143.5 335t343.5 136.5h490v-127h-371v-1415h-116v596q-201 0 -345.5 138t-144.5 336.5zM821 -102v1292h119v-1292h-119z" /> -<glyph unicode="·" horiz-adv-x="440" d="M141 508v164h158v-164h-158z" /> -<glyph unicode="∙" horiz-adv-x="440" d="M141 508v164h158v-164h-158z" /> -<glyph unicode="¸" horiz-adv-x="845" d="M227 -311q39 -12 86 -13q104 0 104.5 70t-116.5 70l-31 -2l54 227l82 -14v-17l-25 -123q66 -10 105.5 -48t39.5 -97q0 -82 -57 -122t-141 -40l-101 10v99z" /> -<glyph unicode="¹" horiz-adv-x="837" d="M162 1231l209 209h104v-791h191v-106h-502v106h192v563l2 70h-4q-10 -20 -26 -37l-92 -90z" /> -<glyph unicode="º" horiz-adv-x="933" d="M125 1126q0 141 100.5 238.5t241.5 97.5t241.5 -97t100.5 -239q0 -145 -99.5 -243.5t-242.5 -98.5t-242.5 98.5t-99.5 243.5zM160 541v96h620v-96h-620zM238 1126q0 -102 66.5 -169.5t162.5 -67.5t162.5 67.5t66.5 169.5q0 100 -66.5 167t-162.5 67t-162.5 -67 t-66.5 -167z" /> -<glyph unicode="»" horiz-adv-x="1069" d="M135 158l336 420l-336 421h152l336 -421l-336 -420h-152zM504 158l336 420l-336 421h151l336 -421l-336 -420h-151z" /> -<glyph unicode="¼" horiz-adv-x="1822" d="M158 1231l209 209h102v-791h188v-106h-497v106h192v563l2 70h-4q-10 -20 -26 -37l-93 -90zM551 0l608 1440h127l-606 -1440h-129zM1016 240v75l426 582h123v-551h137v-106h-137v-240h-117v240h-432zM1155 344q29 2 43 2h252v313l2 80h-4q-14 -29 -33 -55l-231 -305 l-29 -33v-2z" /> -<glyph unicode="½" horiz-adv-x="1822" d="M158 1231l209 209h102v-791h188v-106h-497v106h192v563l2 70h-4q-10 -20 -26 -37l-93 -90zM528 0l609 1440h127l-607 -1440h-129zM1063 102q0 63 20.5 114.5t64.5 91.5t78 62.5t95 57.5q66 37 100.5 60.5t67.5 68.5t33 98q0 63 -44 105.5t-118 42.5q-57 0 -98 -24.5 t-41 -57.5v-51h-111v78q0 82 83 123.5t167 41.5q131 0 205.5 -72.5t74.5 -185.5q0 -61 -20.5 -109t-67.5 -88t-77.5 -60.5t-96.5 -57.5q-49 -29 -74.5 -46.5t-59.5 -46t-48 -59t-14 -67.5q0 -14 16 -15h358q12 0 13 15v72h110v-103q0 -90 -90 -90h-434q-51 0 -71.5 22.5 t-20.5 79.5z" /> -<glyph unicode="¾" horiz-adv-x="1822" d="M127 674l82 80q10 -12 29.5 -32t78 -52.5t115.5 -32.5q72 0 126 50t54 126t-56 121t-136 45h-72l-20 70l196 239l47 49v4q-35 -6 -73 -6h-195q-20 0 -20 -22v-58h-111v88q0 53 20.5 75t75.5 22h453v-80l-242 -283q96 -8 174 -78.5t78 -187.5q0 -123 -89 -204t-212 -81 q-80 0 -155.5 37t-110.5 74zM549 0l608 1440h127l-606 -1440h-129zM1016 240v75l426 582h123v-551h137v-106h-137v-240h-117v240h-432zM1155 344q29 2 43 2h252v313l2 80h-4q-14 -29 -33 -55l-231 -305l-29 -33v-2z" /> -<glyph unicode="¿" horiz-adv-x="882" d="M63 -68q0 94 38 169t91.5 126.5t107.5 98.5t92 109.5t38 135.5v82h137v-88q0 -90 -36.5 -163.5t-89 -124t-104.5 -98.5t-89 -109.5t-37 -130.5q0 -100 75.5 -168t192.5 -68q61 0 124 21.5t93 42.5l31 22l76 -102q-14 -12 -41 -32t-113 -52.5t-176 -32.5q-176 0 -293 102 t-117 260zM420 872v158h158v-158h-158z" /> -<glyph unicode="À" horiz-adv-x="1345" d="M25 0v127h26q57 0 74 45l471 1268h154l471 -1268q16 -45 73 -45h25v-127h-66q-78 0 -110.5 22.5t-59.5 96.5l-125 340h-571l-127 -340q-29 -74 -60.5 -96.5t-107.5 -22.5h-67zM426 584h494l-191 514l-55 186h-4q-31 -119 -56 -186zM434 1784h156l143 -244h-121z" /> -<glyph unicode="Á" horiz-adv-x="1345" d="M25 0v127h26q57 0 74 45l471 1268h154l471 -1268q16 -45 73 -45h25v-127h-66q-78 0 -110.5 22.5t-59.5 96.5l-125 340h-571l-127 -340q-29 -74 -60.5 -96.5t-107.5 -22.5h-67zM426 584h494l-191 514l-55 186h-4q-31 -119 -56 -186zM612 1540l144 244h155l-178 -244h-121z " /> -<glyph unicode="Â" horiz-adv-x="1345" d="M25 0v127h26q57 0 74 45l471 1268h154l471 -1268q16 -45 73 -45h25v-127h-66q-78 0 -110.5 22.5t-59.5 96.5l-125 340h-571l-127 -340q-29 -74 -60.5 -96.5t-107.5 -22.5h-67zM426 584h494l-191 514l-55 186h-4q-31 -119 -56 -186zM432 1540l170 244h143l170 -244h-129 l-110 166h-4l-111 -166h-129z" /> -<glyph unicode="Ã" horiz-adv-x="1345" d="M25 0v127h26q57 0 74 45l471 1268h154l471 -1268q16 -45 73 -45h25v-127h-66q-78 0 -110.5 22.5t-59.5 96.5l-125 340h-571l-127 -340q-29 -74 -60.5 -96.5t-107.5 -22.5h-67zM350 1546q0 240 191 240q59 0 103 -37t81 -74t74 -37q82 0 82 142h108q0 -240 -190 -240 q-59 0 -104.5 37t-81 73t-74.5 36q-82 0 -82 -140h-107zM426 584h494l-191 514l-55 186h-4q-31 -119 -56 -186z" /> -<glyph unicode="Ä" horiz-adv-x="1345" d="M25 0v127h26q57 0 74 45l471 1268h154l471 -1268q16 -45 73 -45h25v-127h-66q-78 0 -110.5 22.5t-59.5 96.5l-125 340h-571l-127 -340q-29 -74 -60.5 -96.5t-107.5 -22.5h-67zM426 584h494l-191 514l-55 186h-4q-31 -119 -56 -186zM461 1608v176h121v-176h-121zM768 1608 v176h121v-176h-121z" /> -<glyph unicode="Å" horiz-adv-x="1345" d="M25 0v127h26q57 0 74 45l471 1268h154l471 -1268q16 -45 73 -45h25v-127h-66q-78 0 -110.5 22.5t-59.5 96.5l-125 340h-571l-127 -340q-29 -74 -60.5 -96.5t-107.5 -22.5h-67zM426 584h494l-191 514l-55 186h-4q-31 -119 -56 -186zM522 1662.5q0 63.5 44 104.5t107.5 41 t107.5 -41t44 -104.5t-44 -104t-107.5 -40.5t-107.5 40.5t-44 104zM606 1663q0 -29 18.5 -48.5t49.5 -19.5q29 0 48 19.5t19 48.5q0 31 -19.5 50.5t-48 19.5t-48 -19.5t-19.5 -50.5z" /> -<glyph unicode="Æ" horiz-adv-x="1685" d="M25 127h18q57 0 74 45l487 1268h848q66 0 95.5 -30t29.5 -95v-144h-135v97q0 45 -45 45h-475v-525h524v-126h-524v-490q0 -27 13 -36t44 -9h477q45 0 45 45v96h135v-143q0 -66 -29.5 -95.5t-95.5 -29.5h-589q-80 0 -112 25.5t-32 99.5v537h-325l-205 -543 q-27 -74 -58.5 -96.5t-109.5 -22.5h-55v127zM500 788h278v525h-82z" /> -<glyph unicode="Ç" horiz-adv-x="1421" d="M78 731q0 311 203.5 522t506.5 211q82 0 171.5 -17.5t174.5 -52t139 -96t54 -139.5v-119h-135v80q0 94 -129 151.5t-270 57.5q-242 0 -404 -169t-162 -429t161 -440t405 -180q84 0 162.5 20.5t134 50t97.5 59t62 50.5l21 20l82 -102l-24 -24q-15 -15 -67.5 -55 t-110.5 -69.5t-151.5 -56.5t-191.5 -29l-19 -88q66 -10 105 -48t39 -97q0 -84 -56.5 -123t-140.5 -39l-100 10v99q39 -12 86 -13q102 0 102 70t-116 70l-29 -2l39 166q-285 27 -462 238.5t-177 512.5z" /> -<glyph unicode="È" horiz-adv-x="1142" d="M86 1313v127h823q66 0 95.5 -30t29.5 -95v-144h-135v97q0 45 -45 45h-492v-525h541v-126h-541v-490q0 -45 46 -45h505q45 0 45 45v96h134v-143q0 -66 -30 -95.5t-95 -29.5h-623q-66 0 -95.5 29.5t-29.5 95.5v1188h-133zM362 1784h156l144 -244h-121z" /> -<glyph unicode="É" horiz-adv-x="1142" d="M86 1313v127h823q66 0 95.5 -30t29.5 -95v-144h-135v97q0 45 -45 45h-492v-525h541v-126h-541v-490q0 -45 46 -45h505q45 0 45 45v96h134v-143q0 -66 -30 -95.5t-95 -29.5h-623q-66 0 -95.5 29.5t-29.5 95.5v1188h-133zM541 1540l143 244h156l-178 -244h-121z" /> -<glyph unicode="Ê" horiz-adv-x="1142" d="M86 1313v127h823q66 0 95.5 -30t29.5 -95v-144h-135v97q0 45 -45 45h-492v-525h541v-126h-541v-490q0 -45 46 -45h505q45 0 45 45v96h134v-143q0 -66 -30 -95.5t-95 -29.5h-623q-66 0 -95.5 29.5t-29.5 95.5v1188h-133zM360 1540l170 244h144l170 -244h-129l-111 166h-4 l-111 -166h-129z" /> -<glyph unicode="Ë" horiz-adv-x="1142" d="M86 1313v127h823q66 0 95.5 -30t29.5 -95v-144h-135v97q0 45 -45 45h-492v-525h541v-126h-541v-490q0 -45 46 -45h505q45 0 45 45v96h134v-143q0 -66 -30 -95.5t-95 -29.5h-623q-66 0 -95.5 29.5t-29.5 95.5v1188h-133zM389 1608v176h121v-176h-121zM696 1608v176h121 v-176h-121z" /> -<glyph unicode="Ì" horiz-adv-x="600" d="M59 1784h156l143 -244h-120zM94 0v127h135v1186h-135v127h412v-127h-137v-1186h137v-127h-412z" /> -<glyph unicode="Í" horiz-adv-x="600" d="M94 0v127h135v1186h-135v127h412v-127h-137v-1186h137v-127h-412zM238 1540l143 244h156l-179 -244h-120z" /> -<glyph unicode="Î" horiz-adv-x="600" d="M57 1540l170 244h144l170 -244h-129l-111 166h-4l-111 -166h-129zM94 0v127h135v1186h-135v127h412v-127h-137v-1186h137v-127h-412z" /> -<glyph unicode="Ï" horiz-adv-x="600" d="M86 1608v176h121v-176h-121zM94 0v127h135v1186h-135v127h412v-127h-137v-1186h137v-127h-412zM393 1608v176h121v-176h-121z" /> -<glyph unicode="Ð" horiz-adv-x="1464" d="M86 1313v127h578q330 0 526 -191.5t196 -527.5q0 -340 -196.5 -530.5t-525.5 -190.5h-320q-66 0 -95.5 29.5t-29.5 95.5v537h-102v122h102v529h-133zM362 172q0 -45 46 -45h241q270 0 429 154.5t159 439.5q0 283 -158.5 437.5t-429.5 154.5h-287v-529h336v-122h-336v-490 z" /> -<glyph unicode="Ñ" horiz-adv-x="1556" d="M86 0v127h88q45 0 45 45v1268h131l735 -1026l117 -189h4q-10 113 -10 189v901q0 66 29.5 95.5t95.5 29.5h152v-127h-89q-45 0 -45 -45v-1268h-131l-735 1026l-119 186h-4q12 -111 12 -186v-901q0 -66 -29.5 -95.5t-94.5 -29.5h-152zM477 1546q0 240 191 240q59 0 103 -37 t81 -74t74 -37q82 0 82 142h108q0 -240 -190 -240q-59 0 -104.5 37t-81 73t-74.5 36q-82 0 -82 -140h-107z" /> -<glyph unicode="Ò" horiz-adv-x="1619" d="M78 729q0 309 213 522t520 213t520 -213t213 -522q0 -315 -214 -534.5t-519 -219.5q-307 0 -520 219.5t-213 534.5zM227 729q0 -260 170 -439t414 -179q242 0 413 179t171 439q0 254 -170 427t-414 173t-414 -173t-170 -427zM565 1784h156l143 -244h-121z" /> -<glyph unicode="Ó" horiz-adv-x="1619" d="M78 729q0 309 213 522t520 213t520 -213t213 -522q0 -315 -214 -534.5t-519 -219.5q-307 0 -520 219.5t-213 534.5zM227 729q0 -260 170 -439t414 -179q242 0 413 179t171 439q0 254 -170 427t-414 173t-414 -173t-170 -427zM743 1540l144 244h155l-178 -244h-121z" /> -<glyph unicode="Ô" horiz-adv-x="1619" d="M78 729q0 309 213 522t520 213t520 -213t213 -522q0 -315 -214 -534.5t-519 -219.5q-307 0 -520 219.5t-213 534.5zM227 729q0 -260 170 -439t414 -179q242 0 413 179t171 439q0 254 -170 427t-414 173t-414 -173t-170 -427zM563 1540l170 244h144l170 -244h-129 l-111 166h-4l-111 -166h-129z" /> -<glyph unicode="Õ" horiz-adv-x="1619" d="M78 729q0 309 213 522t520 213t520 -213t213 -522q0 -315 -214 -534.5t-519 -219.5q-307 0 -520 219.5t-213 534.5zM227 729q0 -260 170 -439t414 -179q242 0 413 179t171 439q0 254 -170 427t-414 173t-414 -173t-170 -427zM481 1546q0 240 191 240q59 0 103 -37t81 -74 t74 -37q82 0 82 142h108q0 -240 -190 -240q-59 0 -104.5 37t-81 73t-74.5 36q-82 0 -82 -140h-107z" /> -<glyph unicode="Ö" horiz-adv-x="1619" d="M78 729q0 309 213 522t520 213t520 -213t213 -522q0 -315 -214 -534.5t-519 -219.5q-307 0 -520 219.5t-213 534.5zM227 729q0 -260 170 -439t414 -179q242 0 413 179t171 439q0 254 -170 427t-414 173t-414 -173t-170 -427zM592 1608v176h121v-176h-121zM899 1608v176 h121v-176h-121z" /> -<glyph unicode="×" d="M98 84l443 498l-443 497l84 84l439 -493l438 493l84 -84l-445 -497l445 -498l-84 -84l-438 494l-439 -494z" /> -<glyph unicode="Ø" horiz-adv-x="1626" d="M80 729q0 309 213 522t520 213q209 0 387 -110l98 137l84 -61l-96 -136q260 -223 260 -565q0 -315 -214 -534.5t-519 -219.5q-215 0 -391 115l-98 -139l-86 59l100 142q-121 104 -189.5 254.5t-68.5 322.5zM229 729q0 -283 195 -461l696 973q-143 88 -307 88 q-244 0 -414 -173t-170 -427zM504 203q145 -92 309 -92q244 0 414 179t170 439q0 272 -197 447z" /> -<glyph unicode="Ù" horiz-adv-x="1468" d="M70 1313v127h151q66 0 95.5 -30t29.5 -95v-815q0 -180 105.5 -284.5t281.5 -104.5q178 0 283.5 105.5t105.5 287.5v811q0 66 30 95.5t95 29.5h152v-127h-88q-45 0 -45 -45v-774q0 -233 -146.5 -376t-384 -143t-385 142.5t-147.5 376.5v774q0 45 -45 45h-88zM498 1784h155 l144 -244h-121z" /> -<glyph unicode="Ú" horiz-adv-x="1468" d="M70 1313v127h151q66 0 95.5 -30t29.5 -95v-815q0 -180 105.5 -284.5t281.5 -104.5q178 0 283.5 105.5t105.5 287.5v811q0 66 30 95.5t95 29.5h152v-127h-88q-45 0 -45 -45v-774q0 -233 -146.5 -376t-384 -143t-385 142.5t-147.5 376.5v774q0 45 -45 45h-88zM676 1540 l143 244h156l-178 -244h-121z" /> -<glyph unicode="Û" horiz-adv-x="1468" d="M70 1313v127h151q66 0 95.5 -30t29.5 -95v-815q0 -180 105.5 -284.5t281.5 -104.5q178 0 283.5 105.5t105.5 287.5v811q0 66 30 95.5t95 29.5h152v-127h-88q-45 0 -45 -45v-774q0 -233 -146.5 -376t-384 -143t-385 142.5t-147.5 376.5v774q0 45 -45 45h-88zM496 1540 l170 244h143l170 -244h-129l-111 166h-4l-110 -166h-129z" /> -<glyph unicode="Ü" horiz-adv-x="1468" d="M70 1313v127h151q66 0 95.5 -30t29.5 -95v-815q0 -180 105.5 -284.5t281.5 -104.5q178 0 283.5 105.5t105.5 287.5v811q0 66 30 95.5t95 29.5h152v-127h-88q-45 0 -45 -45v-774q0 -233 -146.5 -376t-384 -143t-385 142.5t-147.5 376.5v774q0 45 -45 45h-88zM524 1608v176 h121v-176h-121zM831 1608v176h121v-176h-121z" /> -<glyph unicode="Ý" horiz-adv-x="1212" d="M20 1313v127h56q76 0 113.5 -20.5t82.5 -94.5l244 -407l88 -162h4q43 86 88 162l244 407q45 74 83 94.5t114 20.5h55v-127h-33q-63 0 -94 -53l-387 -633v-627h-143v627l-385 633q-33 53 -97 53h-33zM547 1540l143 244h156l-178 -244h-121z" /> -<glyph unicode="Þ" horiz-adv-x="1196" d="M86 1313v127h152q66 0 95 -30t29 -95v-131h332q195 0 320 -119t125 -317q0 -197 -126 -318t-323 -121h-328v-309h-143v1268q0 45 -45 45h-88zM362 436h314q143 0 229 83t86 228.5t-85 227.5t-228 82h-316v-621z" /> -<glyph unicode="ß" horiz-adv-x="1142" d="M41 0v121h84q45 0 45 45v921q0 174 123 275.5t289 101.5q160 0 259 -90t99 -215q0 -68 -36 -128t-78 -95t-77.5 -79t-35.5 -85q0 -49 62.5 -103.5t137 -100.5t137 -126t62.5 -174q0 -139 -96 -216t-236 -77q-178 0 -309 111l-8 8l51 109q12 -12 34.5 -28.5t90.5 -45.5 t131 -29q86 0 143.5 43t57.5 129q0 68 -62.5 131.5t-138.5 107.5t-138.5 112.5t-62.5 144.5q0 57 36 110.5t78 89.5t78 86t36 103q0 72 -58.5 126t-163.5 54q-106 0 -186 -69.5t-80 -190.5v-952q0 -66 -29.5 -95.5t-95.5 -29.5h-143z" /> -<glyph unicode="à" horiz-adv-x="1083" d="M82 281q0 354 631 354h57v12q0 160 -61.5 225.5t-204.5 65.5q-63 0 -132 -20.5t-69 -69.5v-66h-133v99q0 49 39 87t97.5 55t108.5 24.5t91 7.5q227 0 315 -104.5t88 -291.5v-493q0 -45 45 -45h86v-121h-141q-66 0 -94.5 29.5t-28.5 93.5l2 76h-4q2 0 -9 -22.5t-37 -56.5 t-62.5 -67t-99 -55.5t-134.5 -22.5q-141 0 -245.5 80.5t-104.5 225.5zM225 289q0 -78 60.5 -136.5t169.5 -58.5q139 0 227 119t88 264v47h-59q-55 0 -93 -2t-102.5 -8t-109 -21.5t-89.5 -40t-68.5 -66.5t-23.5 -97zM293 1440h156l143 -244h-121z" /> -<glyph unicode="á" horiz-adv-x="1083" d="M82 281q0 354 631 354h57v12q0 160 -61.5 225.5t-204.5 65.5q-63 0 -132 -20.5t-69 -69.5v-66h-133v99q0 49 39 87t97.5 55t108.5 24.5t91 7.5q227 0 315 -104.5t88 -291.5v-493q0 -45 45 -45h86v-121h-141q-66 0 -94.5 29.5t-28.5 93.5l2 76h-4q2 0 -9 -22.5t-37 -56.5 t-62.5 -67t-99 -55.5t-134.5 -22.5q-141 0 -245.5 80.5t-104.5 225.5zM225 289q0 -78 60.5 -136.5t169.5 -58.5q139 0 227 119t88 264v47h-59q-55 0 -93 -2t-102.5 -8t-109 -21.5t-89.5 -40t-68.5 -66.5t-23.5 -97zM471 1196l143 244h156l-178 -244h-121z" /> -<glyph unicode="â" horiz-adv-x="1083" d="M82 281q0 354 631 354h57v12q0 160 -61.5 225.5t-204.5 65.5q-63 0 -132 -20.5t-69 -69.5v-66h-133v99q0 49 39 87t97.5 55t108.5 24.5t91 7.5q227 0 315 -104.5t88 -291.5v-493q0 -45 45 -45h86v-121h-141q-66 0 -94.5 29.5t-28.5 93.5l2 76h-4q2 0 -9 -22.5t-37 -56.5 t-62.5 -67t-99 -55.5t-134.5 -22.5q-141 0 -245.5 80.5t-104.5 225.5zM225 289q0 -78 60.5 -136.5t169.5 -58.5q139 0 227 119t88 264v47h-59q-55 0 -93 -2t-102.5 -8t-109 -21.5t-89.5 -40t-68.5 -66.5t-23.5 -97zM291 1196l170 244h143l170 -244h-129l-110 166h-5 l-110 -166h-129z" /> -<glyph unicode="ã" horiz-adv-x="1083" d="M82 281q0 354 631 354h57v12q0 160 -61.5 225.5t-204.5 65.5q-63 0 -132 -20.5t-69 -69.5v-66h-133v99q0 49 39 87t97.5 55t108.5 24.5t91 7.5q227 0 315 -104.5t88 -291.5v-493q0 -45 45 -45h86v-121h-141q-66 0 -94.5 29.5t-28.5 93.5l2 76h-4q2 0 -9 -22.5t-37 -56.5 t-62.5 -67t-99 -55.5t-134.5 -22.5q-141 0 -245.5 80.5t-104.5 225.5zM209 1202q0 240 190 240q59 0 103.5 -37t81.5 -74t73 -37q82 0 82 142h109q0 -240 -191 -240q-59 0 -104 37t-81 72.5t-75 35.5q-82 0 -82 -139h-106zM225 289q0 -78 60.5 -136.5t169.5 -58.5 q139 0 227 119t88 264v47h-59q-55 0 -93 -2t-102.5 -8t-109 -21.5t-89.5 -40t-68.5 -66.5t-23.5 -97z" /> -<glyph unicode="ä" horiz-adv-x="1083" d="M82 281q0 354 631 354h57v12q0 160 -61.5 225.5t-204.5 65.5q-63 0 -132 -20.5t-69 -69.5v-66h-133v99q0 49 39 87t97.5 55t108.5 24.5t91 7.5q227 0 315 -104.5t88 -291.5v-493q0 -45 45 -45h86v-121h-141q-66 0 -94.5 29.5t-28.5 93.5l2 76h-4q2 0 -9 -22.5t-37 -56.5 t-62.5 -67t-99 -55.5t-134.5 -22.5q-141 0 -245.5 80.5t-104.5 225.5zM225 289q0 -78 60.5 -136.5t169.5 -58.5q139 0 227 119t88 264v47h-59q-55 0 -93 -2t-102.5 -8t-109 -21.5t-89.5 -40t-68.5 -66.5t-23.5 -97zM319 1264v176h121v-176h-121zM627 1264v176h121v-176h-121 z" /> -<glyph unicode="å" horiz-adv-x="1083" d="M82 281q0 354 631 354h57v12q0 160 -61.5 225.5t-204.5 65.5q-63 0 -132 -20.5t-69 -69.5v-66h-133v99q0 49 39 87t97.5 55t108.5 24.5t91 7.5q227 0 315 -104.5t88 -291.5v-493q0 -45 45 -45h86v-121h-141q-66 0 -94.5 29.5t-28.5 93.5l2 76h-4q2 0 -9 -22.5t-37 -56.5 t-62.5 -67t-99 -55.5t-134.5 -22.5q-141 0 -245.5 80.5t-104.5 225.5zM225 289q0 -78 60.5 -136.5t169.5 -58.5q139 0 227 119t88 264v47h-59q-55 0 -93 -2t-102.5 -8t-109 -21.5t-89.5 -40t-68.5 -66.5t-23.5 -97zM381 1318.5q0 63.5 44 104.5t107.5 41t107.5 -41 t44 -104.5t-44 -104t-107.5 -40.5t-107.5 40.5t-44 104zM465 1319q0 -29 18.5 -48.5t48.5 -19.5q29 0 48.5 19.5t19.5 48.5q0 31 -19.5 50.5t-48 19.5t-48 -19.5t-19.5 -50.5z" /> -<glyph unicode="æ" horiz-adv-x="1783" d="M82 281q0 70 23.5 124t58.5 89.5t90 61.5t105.5 39t120 20.5t113.5 8.5t107 1h68v22q0 160 -61.5 225.5t-202.5 65.5q-66 0 -133.5 -20.5t-67.5 -69.5v-66h-133v99q0 86 104.5 130t231.5 44q289 0 356 -213h4q127 213 389 213q201 0 312.5 -132t111.5 -317l-4 -92h-772 q4 -197 111.5 -305.5t273.5 -108.5q170 0 301 119l8 8l66 -104q-16 -16 -47 -41t-130.5 -66t-203.5 -41q-158 0 -276.5 76t-176.5 211h-4q-6 -23 -19 -51.5t-46 -72.5t-73 -77.5t-106.5 -59.5t-144.5 -26q-150 0 -252 81.5t-102 224.5zM225 289q0 -80 61.5 -137.5 t170.5 -57.5q139 0 226 120t87 265v35h-121q-82 0 -142.5 -6t-132 -26.5t-110.5 -69.5t-39 -123zM913 625h625q-6 152 -89 231.5t-200 79.5q-131 0 -222 -80.5t-114 -230.5z" /> -<glyph unicode="ç" horiz-adv-x="1081" d="M82 514q0 236 155.5 388.5t387.5 152.5q49 0 107.5 -11.5t118.5 -34t100 -68.5t40 -105v-93h-131v60q0 59 -79 93t-156 34q-170 0 -285 -116t-115 -300t118 -298t286 -114q186 0 317 131l15 15l65 -105q-6 -6 -16.5 -17t-49 -40t-82.5 -51.5t-114 -41t-146 -18.5l-16 -88 q66 -10 104.5 -48t38.5 -97q0 -84 -56 -123t-140 -39l-103 10v99q39 -12 86 -13q104 0 104.5 70t-116.5 70l-31 -2l39 170q-197 29 -321.5 173t-124.5 357z" /> -<glyph unicode="è" horiz-adv-x="1122" d="M82 514q0 246 146.5 393.5t361.5 147.5q205 0 318.5 -136.5t113.5 -338.5l-4 -70h-791q2 -188 118 -299t282 -111q170 0 299 117l10 10l68 -104q-16 -16 -48 -41t-131.5 -66t-203.5 -41q-231 0 -385 151.5t-154 387.5zM233 621h646q-6 154 -88 235.5t-203 81.5 q-133 0 -231.5 -83.5t-123.5 -233.5zM346 1440h156l143 -244h-121z" /> -<glyph unicode="é" horiz-adv-x="1122" d="M82 514q0 246 146.5 393.5t361.5 147.5q205 0 318.5 -136.5t113.5 -338.5l-4 -70h-791q2 -188 118 -299t282 -111q170 0 299 117l10 10l68 -104q-16 -16 -48 -41t-131.5 -66t-203.5 -41q-231 0 -385 151.5t-154 387.5zM233 621h646q-6 154 -88 235.5t-203 81.5 q-133 0 -231.5 -83.5t-123.5 -233.5zM524 1196l144 244h155l-178 -244h-121z" /> -<glyph unicode="ê" horiz-adv-x="1122" d="M82 514q0 246 146.5 393.5t361.5 147.5q205 0 318.5 -136.5t113.5 -338.5l-4 -70h-791q2 -188 118 -299t282 -111q170 0 299 117l10 10l68 -104q-16 -16 -48 -41t-131.5 -66t-203.5 -41q-231 0 -385 151.5t-154 387.5zM233 621h646q-6 154 -88 235.5t-203 81.5 q-133 0 -231.5 -83.5t-123.5 -233.5zM344 1196l170 244h143l170 -244h-129l-110 166h-4l-111 -166h-129z" /> -<glyph unicode="ë" horiz-adv-x="1122" d="M82 514q0 246 146.5 393.5t361.5 147.5q205 0 318.5 -136.5t113.5 -338.5l-4 -70h-791q2 -188 118 -299t282 -111q170 0 299 117l10 10l68 -104q-16 -16 -48 -41t-131.5 -66t-203.5 -41q-231 0 -385 151.5t-154 387.5zM233 621h646q-6 154 -88 235.5t-203 81.5 q-133 0 -231.5 -83.5t-123.5 -233.5zM373 1264v176h121v-176h-121zM680 1264v176h121v-176h-121z" /> -<glyph unicode="ì" horiz-adv-x="516" d="M6 1440h156l141 -244h-121zM59 909v121h146q66 0 95.5 -29.5t29.5 -95.5v-739q0 -45 45 -45h86v-121h-146q-66 0 -95.5 29.5t-29.5 95.5v739q0 45 -45 45h-86z" /> -<glyph unicode="í" horiz-adv-x="516" d="M59 909v121h146q66 0 95.5 -29.5t29.5 -95.5v-739q0 -45 45 -45h86v-121h-146q-66 0 -95.5 29.5t-29.5 95.5v739q0 45 -45 45h-86zM182 1196l144 244h155l-178 -244h-121z" /> -<glyph unicode="î" horiz-adv-x="516" d="M2 1196l172 244h141l172 -244h-129l-110 166h-4l-113 -166h-129zM59 909v121h146q66 0 95.5 -29.5t29.5 -95.5v-739q0 -45 45 -45h86v-121h-146q-66 0 -95.5 29.5t-29.5 95.5v739q0 45 -45 45h-86z" /> -<glyph unicode="ï" horiz-adv-x="516" d="M51 1264v176h123v-176h-123zM59 909v121h146q66 0 95.5 -29.5t29.5 -95.5v-739q0 -45 45 -45h86v-121h-146q-66 0 -95.5 29.5t-29.5 95.5v739q0 45 -45 45h-86zM309 1264v176h121v-176h-121z" /> -<glyph unicode="ð" horiz-adv-x="1157" d="M76 475q0 197 130 339t359 142q178 0 287 -102l8 -8h4q-70 199 -254 325l-360 -163l-27 98l277 129q-131 68 -291 104l41 119q236 -59 401 -158l269 121l26 -98l-198 -92q309 -242 309 -672q0 -106 -30 -206.5t-89 -186.5t-159.5 -138.5t-229.5 -52.5q-215 0 -344 149.5 t-129 350.5zM219 473q0 -152 90 -262.5t244 -110.5q176 0 268 132.5t92 299.5q0 133 -92 219.5t-241 86.5q-174 0 -267.5 -107.5t-93.5 -257.5z" /> -<glyph unicode="ñ" horiz-adv-x="1245" d="M47 909v121h143q125 0 125 -115v-47l-4 -73h4q37 94 142.5 177t267.5 83q186 0 266 -100.5t80 -299.5v-489q0 -45 45 -45h86v-121h-145q-66 0 -95.5 29.5t-29.5 95.5v493q0 145 -44 225.5t-179 80.5q-131 0 -235.5 -81t-139.5 -210q-16 -57 -17 -139v-494h-139v864 q0 45 -45 45h-86zM326 1202q0 240 190 240q59 0 103.5 -37t81 -74t73.5 -37q82 0 82 142h109q0 -240 -191 -240q-59 0 -104 37t-81 72.5t-75 35.5q-82 0 -82 -139h-106z" /> -<glyph unicode="ò" horiz-adv-x="1251" d="M82 520q0 227 158.5 381t384.5 154q227 0 385.5 -153.5t158.5 -381.5q0 -231 -158.5 -388t-383.5 -157q-227 0 -386 157t-159 388zM225 520q0 -178 117 -299t285 -121q166 0 282.5 121t116.5 299q0 174 -116.5 291t-282.5 117q-168 0 -285 -117t-117 -291zM387 1440h156 l143 -244h-121z" /> -<glyph unicode="ó" horiz-adv-x="1251" d="M82 520q0 227 158.5 381t384.5 154q227 0 385.5 -153.5t158.5 -381.5q0 -231 -158.5 -388t-383.5 -157q-227 0 -386 157t-159 388zM225 520q0 -178 117 -299t285 -121q166 0 282.5 121t116.5 299q0 174 -116.5 291t-282.5 117q-168 0 -285 -117t-117 -291zM565 1196 l144 244h155l-178 -244h-121z" /> -<glyph unicode="ô" horiz-adv-x="1251" d="M82 520q0 227 158.5 381t384.5 154q227 0 385.5 -153.5t158.5 -381.5q0 -231 -158.5 -388t-383.5 -157q-227 0 -386 157t-159 388zM225 520q0 -178 117 -299t285 -121q166 0 282.5 121t116.5 299q0 174 -116.5 291t-282.5 117q-168 0 -285 -117t-117 -291zM385 1196 l170 244h143l170 -244h-129l-110 166h-4l-111 -166h-129z" /> -<glyph unicode="õ" horiz-adv-x="1251" d="M82 520q0 227 158.5 381t384.5 154q227 0 385.5 -153.5t158.5 -381.5q0 -231 -158.5 -388t-383.5 -157q-227 0 -386 157t-159 388zM225 520q0 -178 117 -299t285 -121q166 0 282.5 121t116.5 299q0 174 -116.5 291t-282.5 117q-168 0 -285 -117t-117 -291zM303 1202 q0 240 191 240q59 0 103 -37t81 -74t74 -37q82 0 82 142h108q0 -240 -190 -240q-59 0 -104.5 37t-81.5 72.5t-74 35.5q-82 0 -82 -139h-107z" /> -<glyph unicode="ö" horiz-adv-x="1251" d="M82 520q0 227 158.5 381t384.5 154q227 0 385.5 -153.5t158.5 -381.5q0 -231 -158.5 -388t-383.5 -157q-227 0 -386 157t-159 388zM225 520q0 -178 117 -299t285 -121q166 0 282.5 121t116.5 299q0 174 -116.5 291t-282.5 117q-168 0 -285 -117t-117 -291zM414 1264v176 h121v-176h-121zM721 1264v176h121v-176h-121z" /> -<glyph unicode="÷" d="M102 522v119h1004v-119h-1004zM526 125v151h154v-151h-154zM526 887v151h154v-151h-154z" /> -<glyph unicode="ø" horiz-adv-x="1251" d="M82 520q0 227 158.5 381t384.5 154q154 0 280 -76l80 113l84 -62l-80 -110q180 -158 180 -400q0 -231 -158.5 -388t-383.5 -157q-145 0 -265 66l-77 -109l-84 62l75 104q-194 162 -194 422zM225 520q0 -186 129 -311l475 663q-94 55 -202 56q-168 0 -285 -117t-117 -291z M438 150q88 -49 189 -50q166 0 282.5 121t116.5 299q0 172 -119 287z" /> -<glyph unicode="ù" horiz-adv-x="1234" d="M43 909v121h145q66 0 95.5 -28.5t29.5 -92.5v-497q0 -145 45 -225.5t181 -80.5q168 0 273.5 128t105.5 303v493h139v-864q0 -45 45 -45h86v-121h-141q-125 0 -125 115v47l4 74h-4q-39 -94 -144.5 -177.5t-257.5 -83.5q-180 0 -263 98.5t-83 301.5v489q0 45 -45 45h-86z M365 1440h155l144 -244h-121z" /> -<glyph unicode="ú" horiz-adv-x="1234" d="M43 909v121h145q66 0 95.5 -28.5t29.5 -92.5v-497q0 -145 45 -225.5t181 -80.5q168 0 273.5 128t105.5 303v493h139v-864q0 -45 45 -45h86v-121h-141q-125 0 -125 115v47l4 74h-4q-39 -94 -144.5 -177.5t-257.5 -83.5q-180 0 -263 98.5t-83 301.5v489q0 45 -45 45h-86z M543 1196l143 244h156l-178 -244h-121z" /> -<glyph unicode="û" horiz-adv-x="1234" d="M43 909v121h145q66 0 95.5 -28.5t29.5 -92.5v-497q0 -145 45 -225.5t181 -80.5q168 0 273.5 128t105.5 303v493h139v-864q0 -45 45 -45h86v-121h-141q-125 0 -125 115v47l4 74h-4q-39 -94 -144.5 -177.5t-257.5 -83.5q-180 0 -263 98.5t-83 301.5v489q0 45 -45 45h-86z M362 1196l170 244h144l170 -244h-129l-111 166h-4l-110 -166h-130z" /> -<glyph unicode="ü" horiz-adv-x="1234" d="M43 909v121h145q66 0 95.5 -28.5t29.5 -92.5v-497q0 -145 45 -225.5t181 -80.5q168 0 273.5 128t105.5 303v493h139v-864q0 -45 45 -45h86v-121h-141q-125 0 -125 115v47l4 74h-4q-39 -94 -144.5 -177.5t-257.5 -83.5q-180 0 -263 98.5t-83 301.5v489q0 45 -45 45h-86z M391 1264v176h121v-176h-121zM698 1264v176h121v-176h-121z" /> -<glyph unicode="ý" horiz-adv-x="1103" d="M16 -330l66 103q0 -4 18.5 -21.5t57.5 -37t78 -19.5q121 0 190 168l61 141l-362 858q-20 47 -72 47h-20v121h63q70 0 99.5 -21.5t58.5 -90.5l264 -644l37 -110h4q14 59 35 110l254 644q27 70 57.5 91t102.5 21h63v-121h-20q-53 0 -72 -47l-444 -1077 q-41 -100 -118 -157.5t-177 -57.5q-133 0 -220 94zM487 1196l144 244h155l-178 -244h-121z" /> -<glyph unicode="þ" horiz-adv-x="1196" d="M41 1319v121h145q66 0 95.5 -30t29.5 -95v-367l-4 -90h4q100 197 346 197q209 0 331 -148.5t122 -390.5t-122 -391.5t-331 -149.5q-74 0 -136 19.5t-99 48.5t-63.5 57.5t-36.5 46.5l-11 21h-4q4 -37 4 -90v-488h-139v1684q0 45 -45 45h-86zM307 514q0 -211 96.5 -312.5 t239.5 -101.5q145 0 234.5 114t89.5 302q0 186 -89.5 299t-234.5 113q-147 0 -241.5 -100.5t-94.5 -313.5z" /> -<glyph unicode="ÿ" horiz-adv-x="1103" d="M16 -330l66 103q0 -4 18.5 -21.5t57.5 -37t78 -19.5q121 0 190 168l61 141l-362 858q-20 47 -72 47h-20v121h63q70 0 99.5 -21.5t58.5 -90.5l264 -644l37 -110h4q14 59 35 110l254 644q27 70 57.5 91t102.5 21h63v-121h-20q-53 0 -72 -47l-444 -1077 q-41 -100 -118 -157.5t-177 -57.5q-133 0 -220 94zM336 1264v176h121v-176h-121zM643 1264v176h121v-176h-121z" /> -<glyph unicode="Œ" horiz-adv-x="1863" d="M78 721q0 313 197.5 526t496.5 213q51 0 153.5 -10t137.5 -10h565q66 0 95.5 -30t29.5 -95v-144h-133v97q0 45 -45 45h-477v-525h524v-126h-524v-535h536q45 0 45 45v96h133v-143q0 -125 -114 -125h-633q-35 0 -138.5 -10t-154.5 -10q-299 0 -496.5 213t-197.5 528z M227 721q0 -262 150.5 -433t394.5 -171q119 0 182 14v1176q-72 16 -182 16q-242 0 -393.5 -171t-151.5 -431z" /> -<glyph unicode="œ" horiz-adv-x="2068" d="M82 512q0 240 157.5 391.5t385.5 151.5q154 0 276.5 -74t190.5 -203h4q59 131 174.5 204t265.5 73q205 0 318.5 -136.5t113.5 -338.5l-4 -70h-790q8 -193 121.5 -301.5t277.5 -108.5q170 0 299 117l10 10l68 -104q-16 -16 -48 -41t-131.5 -66t-203.5 -41q-160 0 -283 75 t-186 206h-4q-66 -131 -189 -206t-280 -75q-227 0 -385 149.5t-158 387.5zM225 512q0 -182 116 -297t284 -115t283.5 117t115.5 303q0 182 -116.5 295t-282.5 113q-168 0 -284 -116t-116 -300zM1180 621h645q-8 154 -89 235.5t-202 81.5q-133 0 -231 -83.5t-123 -233.5z" /> -<glyph unicode="Ÿ" horiz-adv-x="1212" d="M20 1313v127h56q76 0 113.5 -20.5t82.5 -94.5l244 -407l88 -162h4q43 86 88 162l244 407q45 74 83 94.5t114 20.5h55v-127h-33q-63 0 -94 -53l-387 -633v-627h-143v627l-385 633q-33 53 -97 53h-33zM395 1608v176h121v-176h-121zM702 1608v176h121v-176h-121z" /> -<glyph unicode="ˆ" horiz-adv-x="962" d="M240 1540l170 244h143l170 -244h-129l-111 166h-4l-110 -166h-129z" /> -<glyph unicode="˜" horiz-adv-x="1007" d="M182 1546q0 240 191 240q59 0 103 -37t81 -74t74 -37q82 0 82 142h108q0 -240 -190 -240q-59 0 -104.5 37t-81 73t-74.5 36q-82 0 -82 -140h-107z" /> -<glyph unicode="–" horiz-adv-x="1314" d="M145 522v119h1024v-119h-1024z" /> -<glyph unicode="—" horiz-adv-x="1724" d="M145 522v119h1434v-119h-1434z" /> -<glyph unicode="‘" horiz-adv-x="434" d="M104 1106l115 352h111l-80 -352h-146z" /> -<glyph unicode="’" horiz-adv-x="434" d="M104 1108l80 352h146l-115 -352h-111z" /> -<glyph unicode="‚" horiz-adv-x="434" d="M104 -184l80 352h146l-115 -352h-111z" /> -<glyph unicode="“" horiz-adv-x="675" d="M104 1106l115 352h111l-80 -352h-146zM346 1106l115 352h110l-79 -352h-146z" /> -<glyph unicode="”" horiz-adv-x="675" d="M104 1108l80 352h146l-115 -352h-111zM346 1108l80 352h145l-114 -352h-111z" /> -<glyph unicode="„" horiz-adv-x="675" d="M104 -184l80 352h146l-115 -352h-111zM346 -184l80 352h145l-114 -352h-111z" /> -<glyph unicode="•" horiz-adv-x="899" d="M158 596q0 121 86 207t206.5 86t205.5 -86t85 -207t-85 -207t-205.5 -86t-206.5 86t-86 207z" /> -<glyph unicode="…" horiz-adv-x="1673" d="M276 0v164h158v-164h-158zM758 0v164h157v-164h-157zM1239 0v164h158v-164h-158z" /> -<glyph unicode="‹" horiz-adv-x="702" d="M78 578l336 421h149l-336 -421l336 -420h-149z" /> -<glyph unicode="›" horiz-adv-x="702" d="M135 158l336 420l-336 421h152l336 -421l-336 -420h-152z" /> -<glyph unicode="€" horiz-adv-x="1208" d="M80 545v104h117q-4 37 -4 72l4 94h-117v105h135q61 242 249.5 393t438.5 151q49 0 96.5 -6t69.5 -12l23 -6l-33 -133q-74 23 -158 22q-195 0 -337 -111.5t-195 -297.5h620l-20 -105h-623q-8 -41 -8 -90l4 -76h596l-18 -104h-553q47 -195 193.5 -314.5t344.5 -119.5 q47 0 93 7t69 13l23 8l32 -131q-94 -33 -219 -33q-258 0 -447.5 159t-244.5 411h-131z" /> -<glyph unicode="™" horiz-adv-x="1998" d="M88 1251v95q0 53 20.5 73.5t75.5 20.5h566q55 0 75.5 -20.5t20.5 -73.5v-95h-107v62q0 20 -20 20h-195v-790h-116v790h-193q-20 0 -20 -20v-62h-107zM858 647h51q20 0 23 21l59 772h107l235 -514q18 -39 29 -84h4q10 45 29 84l235 514h107l59 -772q2 -20 23 -21h51v-104 h-88q-55 0 -74.5 19.5t-24.5 74.5l-41 514l3 59h-5l-229 -499h-94l-230 499h-4l2 -59l-41 -514q-4 -55 -23.5 -74.5t-74.5 -19.5h-88v104z" /> -<glyph unicode="" horiz-adv-x="1030" d="M0 1030h1030v-1030h-1030v1030z" /> -<glyph unicode="fi" horiz-adv-x="1118" d="M51 913v117h129v37q0 119 38 202t98.5 118.5t112.5 49t106 13.5l63 -4v-125q-20 4 -51 4q-37 0 -70 -9t-71.5 -32.5t-62.5 -80t-24 -136.5v-37h488q66 0 95.5 -29.5t29.5 -95.5v-739q0 -45 45 -45h86v-121h-145q-66 0 -95.5 29.5t-29.5 95.5v743q0 45 -45 45h-429v-913 h-139v913h-129zM788 1264v176h136v-176h-136z" /> -<glyph unicode="fl" horiz-adv-x="1105" d="M51 913v117h129v37q0 96 26.5 169t64.5 109.5t90.5 60.5t91.5 29t82 5h260q66 0 95.5 -30t29.5 -95v-1149q0 -45 45 -45h86v-121h-146q-66 0 -95.5 29.5t-29.5 95.5v1149q0 45 -45 45h-186q-229 0 -230 -252v-37h263v-117h-263v-913h-139v913h-129z" /> -<glyph unicode="ffi" horiz-adv-x="1722" d="M51 913v117h129v37q0 119 38 202t98.5 118.5t112.5 49t106 13.5l63 -4v-125q-20 4 -49 4q-37 0 -71 -9t-72.5 -34t-62.5 -80t-24 -137v-35h465v37q0 119 38 202t98.5 118.5t112.5 49t106 13.5l63 -4v-125q-20 4 -49 4q-37 0 -70.5 -9t-72.5 -34t-62.5 -80t-23.5 -137v-35 h487q66 0 95.5 -29.5t29.5 -95.5v-739q0 -45 45 -45h86v-121h-145q-66 0 -95.5 29.5t-29.5 95.5v743q0 45 -45 45h-428v-913h-140v913h-465v-913h-139v913h-129zM1393 1264v176h135v-176h-135z" /> -<glyph unicode="ffl" horiz-adv-x="1708" d="M51 913v117h129v43q0 117 36 198t96.5 116.5t111.5 49t106 13.5l68 -4v-125q-23 4 -53 4q-37 0 -71 -9t-71.5 -34t-60.5 -79t-23 -132v-41h465v37q0 96 27 169t64.5 109.5t90 60.5t91.5 29t82 5h260q66 0 95.5 -30t29.5 -95v-1149q0 -45 45 -45h86v-121h-146 q-66 0 -95.5 29.5t-29.5 95.5v1149q0 45 -45 45h-186q-229 0 -229 -252v-37h262v-117h-262v-913h-140v913h-465v-913h-139v913h-129z" /> -</font> -</defs></svg>
\ No newline at end of file diff --git a/web/cobrands/stevenage/fonts/Museo300-Regular-webfont.ttf b/web/cobrands/stevenage/fonts/Museo300-Regular-webfont.ttf Binary files differdeleted file mode 100755 index 072e9a4e0..000000000 --- a/web/cobrands/stevenage/fonts/Museo300-Regular-webfont.ttf +++ /dev/null diff --git a/web/cobrands/stevenage/fonts/Museo300-Regular-webfont.woff b/web/cobrands/stevenage/fonts/Museo300-Regular-webfont.woff Binary files differdeleted file mode 100755 index f8a9dff96..000000000 --- a/web/cobrands/stevenage/fonts/Museo300-Regular-webfont.woff +++ /dev/null diff --git a/web/cobrands/stevenage/fonts/MuseoSans_300-webfont.eot b/web/cobrands/stevenage/fonts/MuseoSans_300-webfont.eot Binary files differdeleted file mode 100755 index 5287827df..000000000 --- a/web/cobrands/stevenage/fonts/MuseoSans_300-webfont.eot +++ /dev/null diff --git a/web/cobrands/stevenage/fonts/MuseoSans_300-webfont.svg b/web/cobrands/stevenage/fonts/MuseoSans_300-webfont.svg deleted file mode 100755 index 9a04e92bc..000000000 --- a/web/cobrands/stevenage/fonts/MuseoSans_300-webfont.svg +++ /dev/null @@ -1,227 +0,0 @@ -<?xml version="1.0" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" > -<svg xmlns="http://www.w3.org/2000/svg"> -<metadata> -This is a custom SVG webfont generated by Fontspring. -</metadata> -<defs> -<font id="MuseoSans300" horiz-adv-x="1064" > -<font-face units-per-em="2048" ascent="1536" descent="-512" /> -<missing-glyph horiz-adv-x="550" /> -<glyph unicode=" " horiz-adv-x="550" /> -<glyph unicode="	" horiz-adv-x="550" /> -<glyph unicode=" " horiz-adv-x="550" /> -<glyph unicode="!" horiz-adv-x="628" d="M238 0v158h157v-158h-157zM242 1440h143l-6 -1063h-131z" /> -<glyph unicode=""" horiz-adv-x="651" d="M141 1114v346h121v-346h-121zM389 1114v346h121v-346h-121z" /> -<glyph unicode="#" horiz-adv-x="1482" d="M96 399l21 115h289l71 401h-289l19 115h291l71 410h125l-71 -410h354l72 410h125l-72 -410h287l-21 -115h-287l-69 -401h284l-18 -115h-287l-69 -399h-125l69 399h-354l-70 -399h-125l70 399h-291zM532 514h353l71 401h-354z" /> -<glyph unicode="$" horiz-adv-x="1140" d="M125 160l86 108l17 -17q11 -11 49 -38t79 -47.5t104.5 -37.5t127.5 -17q123 0 205 68.5t82 180.5q0 96 -75 165t-181.5 115t-213 95t-181 135t-74.5 207q0 143 104 252t272 129v195h115v-191q201 -10 332 -129l10 -8l-70 -119q-14 14 -40.5 35t-109.5 54.5t-165 33.5 q-135 0 -219 -73.5t-84 -174.5q0 -76 53 -135t134 -94t174.5 -79t174 -89t134 -128t53.5 -191q0 -152 -102.5 -260.5t-274.5 -124.5v-191h-115v191q-115 8 -215 53t-143 86z" /> -<glyph unicode="%" horiz-adv-x="1495" d="M115 1180q0 117 84 200.5t202.5 83.5t203.5 -84t85 -200q0 -119 -84 -202t-205 -83q-119 0 -202.5 83t-83.5 202zM127 0l1098 1440h145l-1096 -1440h-147zM236 1180q0 -72 48 -121t117.5 -49t118.5 49t49 121q0 70 -49 120t-118.5 50t-117.5 -50t-48 -120zM807 258 q0 119 84 203t202.5 84t203.5 -84t85 -203q0 -117 -85 -200t-203.5 -83t-202.5 83t-84 200zM930 260q0 -72 47 -121t116.5 -49t119 49t49.5 121q0 70 -49.5 120t-119 50t-116.5 -50t-47 -120z" /> -<glyph unicode="&" horiz-adv-x="1380" d="M123 397q0 129 69.5 235.5t192.5 143.5v4q-8 2 -21.5 8.5t-48 31t-61.5 57t-48.5 92t-21.5 131.5q0 166 118 265t314 99l164 -20l-41 -119q-68 14 -118 14q-125 0 -207 -66.5t-82 -180.5q0 -43 11 -82t41 -83t96.5 -70t160.5 -26h303v203h141v-203h195v-126h-195v-211 q0 -252 -128 -385.5t-349 -133.5q-215 0 -350 120t-135 302zM268 406q0 -127 92.5 -212t247.5 -85q336 0 336 389v207h-303q-182 0 -277.5 -80t-95.5 -219z" /> -<glyph unicode="'" horiz-adv-x="403" d="M141 1114v346h121v-346h-121z" /> -<glyph unicode="(" horiz-adv-x="593" d="M164 690q0 428 231 805h129q-231 -391 -231 -805q0 -469 231 -885h-129q-231 398 -231 885z" /> -<glyph unicode=")" horiz-adv-x="591" d="M70 -195q231 412 231 885q0 414 -231 805h129q231 -377 231 -805q0 -487 -231 -885h-129z" /> -<glyph unicode="*" horiz-adv-x="964" d="M88 1104l41 129l295 -109l-12 316h139l-14 -316l299 107l41 -125l-304 -88v-4l193 -246l-107 -80l-176 260h-4l-174 -258l-108 78l192 246v4z" /> -<glyph unicode="+" horiz-adv-x="1409" d="M170 522v119h473v522h125v-522h471v-119h-471v-522h-125v522h-473z" /> -<glyph unicode="," horiz-adv-x="499" d="M74 -199l116 367h154l-151 -367h-119z" /> -<glyph unicode="-" horiz-adv-x="1007" d="M213 518v127h582v-127h-582z" /> -<glyph unicode="." horiz-adv-x="505" d="M172 0v164h162v-164h-162z" /> -<glyph unicode="/" horiz-adv-x="802" d="M84 -86l520 1606h129l-518 -1606h-131z" /> -<glyph unicode="0" horiz-adv-x="1280" d="M143 721q0 219 44 379t159 262t295 102q496 0 496 -743q0 -745 -496 -746q-498 1 -498 746zM291 721q0 -612 350 -612q348 0 348 612q0 610 -348 610q-350 0 -350 -610z" /> -<glyph unicode="1" horiz-adv-x="954" d="M115 0v127h323v1057l2 80h-4q-14 -31 -71 -86l-154 -154l-90 92l325 324h132v-1313h317v-127h-780z" /> -<glyph unicode="2" horiz-adv-x="1157" d="M123 92q0 102 41 191.5t105.5 154t143.5 122.5t157.5 111.5t143 108t105.5 125t41 148.5q0 121 -83 198.5t-216 77.5q-59 0 -113.5 -20.5t-91.5 -49t-64.5 -57.5t-39.5 -49l-12 -20l-107 71l16.5 27.5t49.5 62.5t85 80t122.5 62.5t162.5 27.5q201 0 320 -114.5 t119 -288.5q0 -98 -40 -183t-104.5 -147.5t-142.5 -119t-155 -108.5t-141.5 -106.5t-105 -123t-40.5 -146.5h751v-127h-899q-8 43 -8 92z" /> -<glyph unicode="3" horiz-adv-x="1150" d="M92 172l86 109q16 -18 47 -47t127.5 -76t194.5 -47q133 0 231.5 88t98.5 223q0 145 -105.5 226t-257.5 81h-98l-35 84l360 422l76 80v4q-41 -6 -117 -6h-540v127h841v-94l-430 -496q76 -4 149 -27.5t143.5 -70.5t114.5 -131t44 -195q0 -186 -135 -318.5t-338 -132.5 q-80 0 -156 20.5t-128 49.5t-93 57.5t-61 49.5z" /> -<glyph unicode="4" horiz-adv-x="1222" d="M70 399v93l708 948h154v-916h205v-125h-205v-399h-141v399h-721zM242 524h549v602l6 136h-4q-33 -57 -72 -109l-479 -625v-4z" /> -<glyph unicode="5" horiz-adv-x="1142" d="M111 180l90 99q4 -6 12 -17.5t39 -41.5t65.5 -51.5t91 -39.5t117.5 -18q152 0 255.5 96t103.5 241.5t-104.5 241.5t-260.5 96q-150 0 -262 -77l-90 32l78 699h696v-127h-573l-41 -369l-15 -82h4q90 55 220 56q215 0 355 -136.5t140 -332.5q0 -199 -144.5 -336.5 t-355.5 -137.5q-238 0 -393 168z" /> -<glyph unicode="6" horiz-adv-x="1218" d="M133 651q0 141 38 280.5t110.5 260.5t198.5 196.5t286 75.5q72 0 137.5 -15t95.5 -30l31 -14l-53 -125q-90 51 -209 51q-143 0 -250.5 -88t-162 -214t-66.5 -275h4q51 76 151.5 122t212.5 46q197 0 323 -130t126 -335q0 -219 -129 -350.5t-324 -131.5 q-233 0 -376.5 190.5t-143.5 485.5zM287 549q0 -156 106.5 -298t257.5 -142q143 0 226.5 97t83.5 249q0 154 -89.5 247t-236.5 93q-139 0 -243.5 -78t-104.5 -168z" /> -<glyph unicode="7" d="M78 1313v127h936v-99l-668 -1341h-147l581 1180q16 35 37 67l31 49l12 17v4q-37 -4 -108 -4h-674z" /> -<glyph unicode="8" horiz-adv-x="1232" d="M131 414q0 80 31 153.5t77 123.5t75.5 76t52.5 40q-178 117 -179 293q0 152 114 258t321 106q201 0 320.5 -102t119.5 -272q0 -92 -45 -189.5t-76 -136.5t-55 -64q209 -119 209 -309q0 -172 -136.5 -294t-341.5 -122q-203 0 -345 120t-142 319zM276 420 q0 -139 102.5 -226.5t239.5 -87.5q133 0 232.5 82t99.5 205q0 53 -25.5 96t-81 80t-101.5 60.5t-132 59.5t-127 56q-25 -14 -52.5 -37.5t-66 -64.5t-63.5 -100.5t-25 -122.5zM332 1098q0 -45 20.5 -85t45 -65.5t78.5 -56.5t86 -45.5t105.5 -45t102.5 -42.5q25 23 52.5 57.5 t62.5 112.5t35 155q0 115 -83 182.5t-214 67.5q-133 0 -212 -67.5t-79 -167.5z" /> -<glyph unicode="9" horiz-adv-x="1216" d="M113 983q0 219 128 350t322 131q233 0 376.5 -190.5t143.5 -485.5q0 -141 -37.5 -279t-110.5 -260t-199 -198t-285 -76q-70 0 -136.5 14.5t-97.5 30.5l-31 15l54 125q90 -51 209 -51q211 0 334.5 171t146.5 406h-4q-53 -76 -153.5 -122t-213.5 -46q-197 0 -321.5 130 t-124.5 335zM256 985q0 -154 89 -247t237 -93q141 0 244.5 78t103.5 168q0 156 -106.5 298t-258.5 142q-143 0 -226 -97t-83 -249z" /> -<glyph unicode=":" horiz-adv-x="600" d="M219 0v164h162v-164h-162zM219 866v164h162v-164h-162z" /> -<glyph unicode=";" horiz-adv-x="600" d="M127 -199l100 367h154l-135 -367h-119zM227 866v164h162v-164h-162z" /> -<glyph unicode="<" horiz-adv-x="1161" d="M102 530v103l926 414v-138l-752 -325v-4l752 -326v-137z" /> -<glyph unicode="=" horiz-adv-x="1400" d="M223 344v119h955v-119h-955zM223 700v119h955v-119h-955z" /> -<glyph unicode=">" horiz-adv-x="1161" d="M133 117v137l752 326v4l-752 325v138l926 -414v-103z" /> -<glyph unicode="?" horiz-adv-x="985" d="M82 1350q14 12 41 31.5t113 52t176 32.5q176 0 292.5 -102t116.5 -260q0 -94 -38 -170t-91 -126t-107.5 -97t-92 -109.5t-37.5 -136.5v-88h-140v92q0 90 37 164t89.5 124t105.5 97t90 109.5t37 134.5q0 100 -76 167.5t-192 67.5q-135 -2 -248 -88zM307 0v158h158v-158 h-158z" /> -<glyph unicode="@" horiz-adv-x="1648" d="M133 495.5q0 313.5 214 532.5t515 219q258 0 380 -110.5t122 -276.5v-645h145v-115h-551q-174 0 -291.5 116t-117.5 277.5t116.5 277.5t292.5 116h267q-4 102 -92.5 170.5t-260.5 68.5q-250 0 -423 -185t-173 -445q0 -264 173.5 -445.5t433.5 -181.5v-123 q-317 0 -533.5 218t-216.5 531.5zM692 495.5q0 -116.5 81 -198.5t198 -82h254v563h-250q-121 0 -202 -83t-81 -199.5z" /> -<glyph unicode="A" horiz-adv-x="1261" d="M27 0l528 1440h152l528 -1440h-150l-165 459h-580l-164 -459h-149zM381 582h496l-189 522l-55 186h-4q-31 -119 -56 -186z" /> -<glyph unicode="B" horiz-adv-x="1282" d="M209 0v1440h491q174 0 282 -98.5t108 -264.5q0 -221 -183 -313v-4q111 -31 176.5 -128t65.5 -229q0 -186 -123 -294.5t-309 -108.5h-508zM350 127h369q131 0 206.5 76t75.5 205t-78.5 206.5t-205.5 77.5h-367v-565zM350 815h350q109 0 176.5 69.5t67.5 182.5t-65.5 179.5 t-180.5 66.5h-348v-498z" /> -<glyph unicode="C" horiz-adv-x="1490" d="M113 729q0 313 206.5 524t516.5 211q96 0 185 -19.5t146.5 -46t101.5 -54t64 -46.5l21 -20l-76 -104q-6 6 -19.5 17t-57.5 38.5t-91 48t-121 38t-149 17.5q-252 0 -416 -173t-164 -429q0 -262 165 -443.5t419 -181.5q82 0 159.5 19.5t131 48.5t95.5 57.5t60 47.5l21 20 l82 -100l-24 -24q-15 -15 -68.5 -54t-113 -67.5t-153.5 -53.5t-192 -25q-315 0 -522 217.5t-207 536.5z" /> -<glyph unicode="D" horiz-adv-x="1515" d="M209 0v1440h465q328 0 525.5 -191.5t197.5 -527.5q0 -340 -196.5 -530.5t-526.5 -190.5h-465zM350 127h309q270 0 430 154.5t160 439.5q0 283 -159.5 437.5t-430.5 154.5h-309v-1186z" /> -<glyph unicode="E" horiz-adv-x="1169" d="M209 0v1440h811v-127h-670v-525h547v-126h-547v-535h707v-127h-848z" /> -<glyph unicode="F" horiz-adv-x="1052" d="M209 0v1440h758v-127h-617v-541h529v-127h-529v-645h-141z" /> -<glyph unicode="G" horiz-adv-x="1552" d="M113 721q0 313 207.5 528t517.5 215q147 0 275 -42t181 -83l56 -43l-76 -106q-18 16 -54 39.5t-147.5 63.5t-228.5 40q-258 0 -421 -175t-163 -435q0 -266 163 -441.5t408 -175.5q125 0 238 53.5t164 106.5l51 51v244h-246v127h381v-688h-131v109l2 61h-4 q-6 -8 -19.5 -21.5t-58.5 -46t-95 -58.5t-131 -47.5t-165 -21.5q-297 0 -500.5 213.5t-203.5 532.5z" /> -<glyph unicode="H" horiz-adv-x="1536" d="M209 0v1440h141v-656h836v656h141v-1440h-141v657h-836v-657h-141z" /> -<glyph unicode="I" horiz-adv-x="559" d="M209 0v1440h141v-1440h-141z" /> -<glyph unicode="J" horiz-adv-x="1073" d="M72 403v58h141v-53q0 -154 77 -228t187 -74q109 0 185.5 72t76.5 225v910h-352v127h494v-1037q0 -217 -119 -322.5t-287 -105.5q-166 0 -284.5 106.5t-118.5 321.5z" /> -<glyph unicode="K" horiz-adv-x="1230" d="M209 0v1440h141v-625h244l387 625h162l-430 -680v-4l458 -756h-165l-412 688h-244v-688h-141z" /> -<glyph unicode="L" horiz-adv-x="1060" d="M209 0v1440h141v-1313h668v-127h-809z" /> -<glyph unicode="M" horiz-adv-x="1748" d="M164 0l115 1440h147l377 -846l69 -176h5q39 102 71 176l377 846h145l115 -1440h-141l-80 1008l-4 200h-4q-43 -127 -76 -200l-338 -740h-133l-338 740l-78 204h-4q2 -127 -4 -204l-80 -1008h-141z" /> -<glyph unicode="N" horiz-adv-x="1542" d="M209 0v1440h137l735 -1037l119 -194h4q-12 119 -12 194v1037h141v-1440h-137l-735 1036l-119 195h-4q12 -119 12 -195v-1036h-141z" /> -<glyph unicode="O" horiz-adv-x="1687" d="M111 729q0 309 213 522t520 213t520 -213t213 -522q0 -315 -214 -534.5t-519 -219.5t-519 219.5t-214 534.5zM258 729q0 -262 170 -442.5t416 -180.5q244 0 415 180.5t171 442.5q0 256 -171.5 430t-414.5 174q-246 0 -416 -174t-170 -430z" /> -<glyph unicode="P" horiz-adv-x="1224" d="M209 0v1440h498q197 0 320.5 -119t123.5 -315q0 -199 -124 -320t-320 -121h-357v-565h-141zM350 692h338q145 0 231.5 84t86.5 230q0 143 -85 225t-231 82h-340v-621z" /> -<glyph unicode="Q" horiz-adv-x="1710" d="M111 729q0 309 212 522t517 213q311 0 524 -213t213 -522q0 -285 -180 -496l178 -178l-86 -88l-176 178q-199 -170 -473 -170q-305 0 -517 219.5t-212 534.5zM258 729q0 -262 168 -442.5t414 -180.5q215 0 372 136l-176 180l86 88l174 -178q133 170 134 397 q0 258 -170 431t-420 173q-246 0 -414 -173t-168 -431z" /> -<glyph unicode="R" horiz-adv-x="1286" d="M209 0v1440h426q180 0 270 -39q102 -45 159.5 -142.5t57.5 -228.5q0 -145 -74.5 -249.5t-197.5 -139.5v-4q14 -18 37 -57l313 -580h-162l-325 606h-363v-606h-141zM350 733h342q131 0 208 79t77 214q0 182 -131 252q-66 35 -205 35h-291v-580z" /> -<glyph unicode="S" horiz-adv-x="1101" d="M102 160l84 108l18 -17q11 -11 49 -38t79 -47.5t104.5 -37.5t126.5 -17q123 0 205 68.5t82 180.5q0 98 -74 168t-179 114t-211.5 92t-180.5 134t-74 209q0 160 127 273.5t322 113.5q221 0 370 -125l15 -14l-70 -119q-14 14 -41 35t-108.5 54.5t-165.5 33.5 q-133 0 -218.5 -73.5t-85.5 -174.5q0 -94 74 -158.5t179.5 -107.5t212 -91t180 -138t73.5 -221q0 -166 -118.5 -278t-317.5 -112q-131 0 -244.5 46.5t-162.5 93.5z" /> -<glyph unicode="T" horiz-adv-x="1204" d="M14 1313v127h1176v-127h-516v-1313h-142v1313h-518z" /> -<glyph unicode="U" horiz-adv-x="1482" d="M190 502v938h144v-936q0 -184 110.5 -291t296.5 -107q188 0 299 108t111 294v932h141v-938q0 -238 -151.5 -382.5t-397.5 -144.5q-248 0 -400.5 144.5t-152.5 382.5z" /> -<glyph unicode="V" horiz-adv-x="1265" d="M25 1440h151l399 -1094l56 -186h4q29 113 55 186l400 1094h151l-534 -1440h-148z" /> -<glyph unicode="W" horiz-adv-x="1898" d="M80 1440h147l279 -1118l33 -154h4l4 20q4 23 12 62t16 72l304 1118h135l303 -1118q8 -33 16 -72t13 -62l4 -20h4q14 80 32 154l289 1118h148l-383 -1440h-170l-275 1014l-47 215h-4q-23 -123 -47 -215l-274 -1014h-170z" /> -<glyph unicode="X" horiz-adv-x="1212" d="M53 0l459 752l-418 688h166l252 -426l94 -166h4q41 92 86 166l254 426h168l-422 -688l461 -752h-164l-299 498l-90 159h-4q-43 -86 -88 -161l-295 -496h-164z" /> -<glyph unicode="Y" horiz-adv-x="1175" d="M31 1440h162l305 -522q43 -74 88 -173h4q43 96 88 173l305 522h160l-484 -822v-618h-143v618z" /> -<glyph unicode="Z" horiz-adv-x="1218" d="M88 0v100l743 1082q53 76 101 131v4q-35 -4 -105 -4h-700v127h981v-101l-743 -1081q-53 -78 -103 -131v-4q37 4 107 4h745v-127h-1026z" /> -<glyph unicode="[" horiz-adv-x="577" d="M219 -195v1690h277v-115h-148v-1460h148v-115h-277z" /> -<glyph unicode="\" horiz-adv-x="804" d="M70 1520h131l518 -1606h-129z" /> -<glyph unicode="]" horiz-adv-x="577" d="M82 -80h147v1460h-147v115h276v-1690h-276v115z" /> -<glyph unicode="^" horiz-adv-x="1241" d="M150 512l405 928h96l406 -928h-133l-320 758l-319 -758h-135z" /> -<glyph unicode="_" horiz-adv-x="1196" d="M70 0h1056v-119h-1056v119z" /> -<glyph unicode="`" horiz-adv-x="1032" d="M365 1784h161l142 -244h-127z" /> -<glyph unicode="a" d="M84 281q0 356 631 356h57v27q0 266 -256 266q-76 0 -148.5 -24.5t-107.5 -49.5l-35 -25l-65 107q14 12 43.5 31.5t125 52.5t197.5 33q186 0 285.5 -101.5t99.5 -294.5v-659h-133v113l4 86h-4q-4 -8 -11 -23.5t-36 -54.5t-64.5 -67.5t-98 -53.5t-134.5 -25 q-141 0 -245.5 80.5t-104.5 225.5zM227 289q0 -78 60.5 -136.5t169.5 -58.5q139 0 227 119t88 264v45h-59q-86 0 -148.5 -5t-150.5 -25.5t-137.5 -71.5t-49.5 -131z" /> -<glyph unicode="b" horiz-adv-x="1206" d="M168 0v1440h139v-500l-4 -84h4q4 8 11.5 21.5t36 47t65.5 60.5t100.5 48.5t136.5 21.5q205 0 327 -149.5t122 -391.5t-130 -390.5t-335 -148.5q-70 0 -129 20.5t-96 50.5t-63.5 59.5t-37.5 50.5l-12 20h-4q4 -35 4 -84v-92h-135zM303 512q0 -168 86 -291t242 -123 q141 0 236.5 113t95.5 303q0 188 -90.5 301t-235.5 113q-141 0 -237.5 -104.5t-96.5 -311.5z" /> -<glyph unicode="c" horiz-adv-x="1124" d="M96 514q0 236 156 388.5t385 152.5q221 0 360 -131l17 -17l-72 -104q-12 14 -36.5 34.5t-103.5 55.5t-161 35q-172 0 -286.5 -116t-114.5 -298q0 -180 116.5 -297t288.5 -117q59 0 114.5 15.5t92.5 36t66.5 42t44.5 35.5l12 17l63 -109q-6 -6 -16 -17t-49 -39t-82 -49.5 t-111.5 -39t-142.5 -17.5q-231 0 -386 150.5t-155 388.5z" /> -<glyph unicode="d" horiz-adv-x="1206" d="M100 516q0 242 129 390.5t334 148.5q207 0 316 -158l20 -37h4q-4 35 -4 78v502h139v-1440h-135v109l4 73h-4l-11 -22q-7 -14 -36 -50t-65.5 -63t-101 -49.5t-140.5 -22.5q-205 0 -327 149.5t-122 391.5zM244 516.5q0 -188.5 90 -302.5t235 -114q141 0 237.5 104.5 t96.5 311.5q0 170 -86 292t-242 122q-141 0 -236 -112.5t-95 -301z" /> -<glyph unicode="e" horiz-adv-x="1132" d="M96 514q0 246 146.5 393.5t361.5 147.5q205 0 317.5 -136.5t112.5 -338.5l-4 -72h-790q4 -190 117.5 -299t281.5 -109q172 0 305 117l8 8l64 -106q-16 -16 -48 -40t-131.5 -64t-201.5 -40q-231 0 -385 151.5t-154 387.5zM246 623h647q-6 154 -88 234.5t-205 80.5 q-135 0 -232 -82.5t-122 -232.5z" /> -<glyph unicode="f" horiz-adv-x="655" d="M86 901v117h129v49q0 119 38 202t99.5 118.5t112.5 49t106 13.5l64 -4v-125q-20 4 -49 4q-37 0 -71 -9t-74 -32.5t-63.5 -80t-23.5 -136.5v-49h264v-117h-264v-901h-139v901h-129z" /> -<glyph unicode="g" horiz-adv-x="1191" d="M100 534.5q0 233.5 121 377t326 143.5q76 0 139.5 -17.5t99 -43t60 -51t33.5 -42.5l8 -18h4q-2 12 -2 35v112h135v-1005q0 -229 -142.5 -342t-351.5 -113q-178 0 -337 82l53 115q127 -72 278 -72q162 0 261.5 80t99.5 243v95l4 73h-4q-96 -180 -326 -180 q-207 0 -333 147.5t-126 381zM244 536.5q0 -184.5 92 -295t246 -110.5q135 0 220 95.5t85 308.5q0 393 -326 393q-150 0 -233.5 -103.5t-83.5 -288z" /> -<glyph unicode="h" horiz-adv-x="1214" d="M168 0v1440h139v-557l-4 -84h4q37 92 144.5 174t265.5 82q184 0 264 -100.5t80 -299.5v-655h-139v618q0 145 -44 225.5t-180 80.5q-131 0 -235.5 -82t-138.5 -211q-16 -55 -17 -137v-494h-139z" /> -<glyph unicode="i" horiz-adv-x="475" d="M164 1266v174h145v-174h-145zM168 0v1030h139v-1030h-139z" /> -<glyph unicode="j" horiz-adv-x="475" d="M-113 -295q18 -2 45 -2q37 0 72 9t75 34t64.5 82t24.5 139v1063h139v-1069q0 -121 -38 -203t-100.5 -117.5t-113.5 -49t-106 -13.5l-62 6v121zM166 1266v174h143v-174h-143z" /> -<glyph unicode="k" horiz-adv-x="1028" d="M168 0v1440h139v-803h164l309 393h168l-358 -448v-4l393 -578h-166l-344 516h-166v-516h-139z" /> -<glyph unicode="l" horiz-adv-x="505" d="M158 244v1196h139v-1166q0 -156 115 -155l34 2v-125q-25 -4 -51 -4q-237 0 -237 252z" /> -<glyph unicode="m" horiz-adv-x="1875" d="M168 1030h137v-153l-4 -82h4q37 106 145.5 183t227.5 77q272 0 319 -258h4q43 109 147.5 183.5t231.5 74.5q182 0 262 -100.5t80 -299.5v-655h-139v621q0 145 -47 226t-176 81q-115 0 -205 -86t-121 -205q-18 -57 -18 -150v-487h-139v621q0 68 -7.5 114.5t-28 95 t-66.5 73t-116 24.5q-121 0 -212 -88t-125 -215q-14 -59 -15 -138v-487h-139v1030z" /> -<glyph unicode="n" horiz-adv-x="1214" d="M168 1030h137v-153l-4 -82h4q37 94 143.5 177t268.5 83q184 0 264 -100.5t80 -299.5v-655h-139v618q0 145 -44 225.5t-180 80.5q-131 0 -235.5 -81t-138.5 -210q-16 -57 -17 -139v-494h-139v1030z" /> -<glyph unicode="o" horiz-adv-x="1273" d="M92 520q0 227 159 381t386 154t386 -153.5t159 -381.5q0 -231 -159 -388t-386 -157t-386 157t-159 388zM236 520q0 -178 116.5 -299t284.5 -121t284.5 121t116.5 299q0 174 -116.5 291t-284.5 117t-284.5 -117t-116.5 -291z" /> -<glyph unicode="p" horiz-adv-x="1206" d="M168 -410v1440h133v-100l-4 -80h4l11 22q7 14 36 49t66 62t102.5 49.5t140.5 22.5q205 0 327 -149.5t122 -391.5t-129 -390.5t-332 -148.5q-70 0 -130 20.5t-96 49.5t-62.5 57.5t-37.5 49.5l-12 20h-4q4 -37 4 -90v-492h-139zM303 512q0 -166 88 -290t240 -124 q141 0 236.5 113t95.5 303q0 188 -90.5 301t-235.5 113q-141 0 -237.5 -104.5t-96.5 -311.5z" /> -<glyph unicode="q" horiz-adv-x="1206" d="M100 516q0 242 129 390.5t334 148.5q207 0 318 -162l20 -37h4q-2 33 -2 78v96h135v-1440h-139v496l4 90h-4q-4 -8 -11 -21.5t-36 -48t-65.5 -61.5t-100 -48.5t-137.5 -21.5q-205 0 -327 149.5t-122 391.5zM244 516.5q0 -188.5 90 -302.5t235 -114q141 0 237.5 104.5 t96.5 311.5q0 170 -86 292t-242 122q-141 0 -236 -112.5t-95 -301z" /> -<glyph unicode="r" horiz-adv-x="729" d="M168 0v1030h137v-182l-4 -82h4q39 123 124 198.5t202 75.5l55 -6v-137q-25 4 -51 4q-106 0 -185 -73.5t-114 -192.5q-29 -92 -29 -201v-434h-139z" /> -<glyph unicode="s" horiz-adv-x="907" d="M84 125l76 100q12 -14 36.5 -34.5t104.5 -55.5t166 -35q88 0 147.5 43t59.5 121q0 61 -57.5 105.5t-138.5 75t-163 66.5t-139 101.5t-57 157.5q0 133 102.5 209t249.5 76q61 0 115.5 -11.5t90.5 -28t62.5 -33.5t38.5 -28l10 -12l-63 -106q-10 10 -29.5 25.5t-86 42 t-142.5 26.5q-86 0 -145.5 -40t-59.5 -120q0 -61 57.5 -105t139.5 -74t162.5 -66t138 -101.5t57.5 -159.5q0 -127 -98 -208t-254 -81q-70 0 -135.5 15.5t-107.5 37t-74.5 44t-49.5 39.5z" /> -<glyph unicode="t" horiz-adv-x="686" d="M72 901v117h137v297h137v-297h258v-117h-258v-512q0 -70 17.5 -121t42 -79.5t57.5 -45t59.5 -21.5t55.5 -5l47 4v-125q-23 -4 -60 -4q-43 0 -84 6t-93 29.5t-90 62.5t-64.5 112.5t-26.5 172.5v526h-135z" /> -<glyph unicode="u" horiz-adv-x="1204" d="M154 375v655h139v-618q0 -145 44 -225.5t179 -80.5q170 0 275.5 127t105.5 304v493h139v-1030h-135v154l4 82h-4q-39 -94 -144.5 -177.5t-258.5 -83.5q-180 0 -262 98.5t-82 301.5z" /> -<glyph unicode="v" horiz-adv-x="993" d="M27 1030h147l287 -756l35 -122h4q16 70 37 122l284 756h146l-394 -1030h-151z" /> -<glyph unicode="w" horiz-adv-x="1640" d="M35 1030h147l250 -768l31 -110h4q14 61 31 110l254 764h137l254 -764l31 -110h4q14 59 30 110l250 768h148l-349 -1030h-151l-252 733l-33 111h-4q-14 -59 -31 -111l-251 -733h-152z" /> -<glyph unicode="x" horiz-adv-x="1005" d="M51 0l363 537l-332 493h164l221 -346l35 -59h2q18 33 35 59l221 346h164l-332 -493l362 -537h-163l-250 387l-35 57h-4h-2q-16 -31 -35 -57l-250 -387h-164z" /> -<glyph unicode="y" horiz-adv-x="1021" d="M14 -369l54 111q57 -47 122 -47q121 0 195 168l64 145l-431 1022h154l303 -751l37 -109h4q14 57 35 109l297 751h151l-507 -1245q-41 -100 -119 -157.5t-178 -57.5q-105 0 -181 61z" /> -<glyph unicode="z" horiz-adv-x="1042" d="M86 0v90l576 723l81 94v4q-35 -4 -102 -4h-530v123h821v-92l-576 -721l-84 -94v-4q37 4 105 4h575v-123h-866z" /> -<glyph unicode="{" horiz-adv-x="688" d="M109 598v127q6 0 18 3t42 18.5t53.5 38t42 69.5t18.5 107v167q0 96 24.5 168t58 109t80 58.5t78 26.5t64.5 5h30v-115h-18q-27 0 -52.5 -7t-60 -30.5t-55 -79t-20.5 -139.5v-200q0 -55 -16.5 -103.5t-41 -76t-49 -47t-41.5 -25.5l-16 -8v-5q6 -2 17 -7t40 -24.5t50.5 -46 t39 -74.5t17.5 -108v-225q0 -82 21.5 -138t55 -79t59 -31t52.5 -8h18v-115q-12 -2 -30 -2q-33 0 -64.5 5.5t-78 28t-80 59t-58 108.5t-24.5 168v195q0 59 -18.5 105t-43 69.5t-50.5 38t-44 16.5z" /> -<glyph unicode="|" horiz-adv-x="563" d="M217 -322v1936h129v-1936h-129z" /> -<glyph unicode="}" horiz-adv-x="688" d="M70 -82h20q25 0 50.5 8t59 31t55 79t21.5 138v225q0 59 16.5 107.5t41 75t49.5 46t41 25.5l16 6v5q-6 2 -17 7t-40 26.5t-50.5 48t-39 74.5t-17.5 104v200q0 84 -20 139.5t-55 79t-59.5 30.5t-51.5 7h-20v115h32q31 0 63 -5t78 -27.5t79.5 -58.5t58.5 -107.5t25 -168.5 v-167q0 -174 137 -226l37 -10v-127q-6 0 -18.5 -3t-42.5 -18.5t-53.5 -38t-41.5 -68.5t-18 -105v-195q0 -96 -25 -168t-58.5 -108.5t-79.5 -59t-78 -28t-63 -5.5l-32 2v115z" /> -<glyph unicode="~" horiz-adv-x="1232" d="M152 428q0 162 69.5 239.5t190.5 77.5q61 0 110 -21.5t81 -53t61.5 -63.5t68.5 -53.5t86 -21.5q82 0 114 63.5t32 141.5h120q0 -162 -69.5 -239.5t-190.5 -77.5q-76 0 -134 33.5t-89 72.5t-79 73t-105 34q-82 0 -114 -63.5t-32 -141.5h-120z" /> -<glyph unicode="¡" horiz-adv-x="561" d="M201 872v158h157v-158h-157zM209 -410l6 1063h131l6 -1063h-143z" /> -<glyph unicode="¢" horiz-adv-x="1171" d="M123 720.5q0 231.5 113.5 390.5t316.5 181v172h115v-172q262 -31 383 -303l-131 -49q-102 221 -304 221q-170 0 -259 -123t-89 -317q0 -197 88 -318.5t260 -121.5q203 0 304 221l131 -51q-57 -127 -154.5 -209t-228.5 -95v-174h-115v174q-203 23 -316.5 182.5t-113.5 391 z" /> -<glyph unicode="£" horiz-adv-x="1206" d="M121 0v127h129v541h-90v112h90v305q0 162 119.5 270.5t304.5 108.5q86 0 166 -29.5t116 -58.5l37 -28l-86 -103q-100 86 -233 86q-131 0 -206 -72.5t-75 -181.5v-297h393v-112h-393v-541h694v-127h-966z" /> -<glyph unicode="¥" horiz-adv-x="1230" d="M70 1440h161l293 -510q47 -82 88 -185h4q41 102 89 185l294 510h162l-360 -619h215v-104h-273l-55 -99v-79h328v-107h-328v-432h-143v432h-334v107h334v79l-58 99h-276v104h217z" /> -<glyph unicode="§" horiz-adv-x="843" d="M113 -41l71 98q72 -61 168.5 -61t159.5 60.5t63 162.5q0 35 -8 66l-133 878h123l139 -889q8 -53 9 -71q0 -143 -98.5 -236.5t-256.5 -93.5q-137 2 -237 86zM139 1135q0 143 97.5 236t255.5 93q137 -2 237 -86l-72 -96q-70 59 -166 59t-160.5 -58t-64.5 -161q0 -33 8 -63 l136 -885h-123l-140 889q-8 33 -8 72z" /> -<glyph unicode="¨" horiz-adv-x="1032" d="M299 1608v176h125v-176h-125zM608 1608v176h127v-176h-127z" /> -<glyph unicode="©" horiz-adv-x="1701" d="M123 721q0 309 212 526t511 217q305 0 519 -217t214 -526q0 -313 -213 -529.5t-520 -216.5q-301 0 -512 217.5t-211 528.5zM244 721q0 -268 174 -451.5t428 -183.5q260 0 437 183.5t177 451.5q0 266 -177 449.5t-437 183.5q-254 0 -428 -183.5t-174 -449.5zM444 717 q0 172 115 297t307 125q63 0 120.5 -19.5t94.5 -47.5t66 -56.5t41 -48.5l12 -19l-94 -63l-10 15q-6 9 -29 33.5t-48.5 43t-65.5 34t-83 15.5q-141 0 -223 -90t-82 -217t81 -217t224 -90q135 0 226 127l10 14l94 -64q-4 -8 -13 -20t-40 -45t-67 -58.5t-93 -46t-121 -20.5 q-195 0 -308.5 124t-113.5 294z" /> -<glyph unicode="ª" horiz-adv-x="874" d="M166 541v96h541v-96h-541zM170 977q0 227 391 227h27v8q0 152 -146 152q-41 0 -84 -14.5t-65 -30.5l-23 -14l-53 79q90 76 236 76q121 0 183 -64.5t62 -187.5v-413h-106v100h-4q-6 -12 -19.5 -30.5t-63.5 -50.5t-110 -32q-90 0 -157.5 51.5t-67.5 143.5zM285 987 q0 -45 33.5 -75.5t93.5 -30.5q78 0 126 66.5t48 148.5v18h-25q-276 0 -276 -127z" /> -<glyph unicode="«" horiz-adv-x="1071" d="M102 578l336 421h150l-336 -421l336 -420h-150zM469 578l336 421h151l-335 -421l335 -420h-151z" /> -<glyph unicode="¬" horiz-adv-x="1275" d="M150 700v119h954v-495h-125v376h-829z" /> -<glyph unicode="­" horiz-adv-x="884" d="M152 518v127h581v-127h-581z" /> -<glyph unicode="®" horiz-adv-x="1701" d="M123 721q0 309 212 526t511 217q305 0 519 -217t214 -526q0 -313 -213 -529.5t-520 -216.5q-301 0 -512 217.5t-211 528.5zM244 721q0 -268 174 -451.5t428 -183.5q260 0 437 183.5t177 451.5q0 266 -177 449.5t-437 183.5q-254 0 -428 -183.5t-174 -449.5zM604 1120h285 q106 0 172.5 -65.5t66.5 -171.5q0 -84 -44 -140.5t-105 -70.5v-4q8 -10 27 -45l153 -301h-127l-160 323h-153v-323h-115v798zM719 735h149q66 0 104 39t38 109q0 68 -38 104.5t-104 36.5h-149v-289z" /> -<glyph unicode="¯" horiz-adv-x="1032" d="M264 1608v112h504v-112h-504z" /> -<glyph unicode="°" horiz-adv-x="780" d="M102 1178q0 117 84 200.5t203 83.5t204 -84t85 -200q0 -119 -84 -202t-205 -83q-119 0 -203 83t-84 202zM225 1178q0 -72 47 -121t117 -49t119 49t49 121q0 70 -49 120t-119 50t-117 -50t-47 -120z" /> -<glyph unicode="±" horiz-adv-x="1409" d="M170 522v119h473v522h125v-522h471v-119h-471v-522h-125v522h-473zM207 -213h995v-119h-995v119z" /> -<glyph unicode="²" horiz-adv-x="782" d="M102 930q0 94 46.5 167.5t112 121t130 88.5t110.5 93t46 116q0 66 -47 111.5t-121 45.5q-100 0 -178 -96l-4 -4l-74 72q10 14 29.5 36.5t87 59.5t143.5 37q127 0 203 -74t76 -186q0 -84 -44.5 -149.5t-108 -108.5t-127 -82t-109.5 -92.5t-50 -116.5h455v-103h-569 q-7 35 -7 64z" /> -<glyph unicode="³" horiz-adv-x="782" d="M88 981l72 78q8 -12 25.5 -29.5t73.5 -47.5t118 -30q74 0 133 52.5t59 130t-60 125t-140 47.5h-68l-29 63l203 236l51 51v4q-39 -6 -75 -6h-316v102h539v-74l-244 -282q102 -12 178 -78t76 -188q0 -119 -88 -204t-217 -85q-55 0 -105.5 14.5t-82 33.5t-56 38.5 t-37.5 34.5z" /> -<glyph unicode="´" horiz-adv-x="1032" d="M365 1540l141 244h162l-176 -244h-127z" /> -<glyph unicode="µ" horiz-adv-x="1247" d="M182 -410v1440h140v-618q0 -145 45 -225.5t180 -80.5q168 0 273.5 128t105.5 303v493h139v-1030h-135v156l4 80h-4q-4 -10 -13.5 -28t-43 -63t-74.5 -79.5t-114 -62.5t-157 -28q-76 0 -133 21.5t-76 44.5l-18 20h-4q14 -104 14 -155v-316h-129z" /> -<glyph unicode="μ" horiz-adv-x="1247" d="M182 -410v1440h140v-618q0 -145 45 -225.5t180 -80.5q168 0 273.5 128t105.5 303v493h139v-1030h-135v156l4 80h-4q-4 -10 -13.5 -28t-43 -63t-74.5 -79.5t-114 -62.5t-157 -28q-76 0 -133 21.5t-76 44.5l-18 20h-4q14 -104 14 -155v-316h-129z" /> -<glyph unicode="¶" horiz-adv-x="1173" d="M100 968.5q0 198.5 143.5 335t344.5 136.5h489v-127h-370v-1415h-117v596q-201 0 -345.5 138t-144.5 336.5zM834 -102v1292h118v-1292h-118z" /> -<glyph unicode="·" horiz-adv-x="555" d="M199 508v164h157v-164h-157z" /> -<glyph unicode="¸" horiz-adv-x="1032" d="M367 -311q39 -12 86 -13q104 0 104 70t-117 70l-30 -2l53 227l82 -14v-17l-23 -123q63 -10 103.5 -48t40.5 -97q0 -84 -56.5 -123t-140.5 -39l-102 10v99z" /> -<glyph unicode="¹" horiz-adv-x="782" d="M150 1556l202 201h107v-788h190v-103h-497v103h194v592l2 49h-2q-8 -16 -43 -51l-82 -78z" /> -<glyph unicode="º" horiz-adv-x="970" d="M141 1126q0 141 100.5 238.5t242 97.5t241.5 -97t100 -239q0 -145 -99 -243.5t-242.5 -98.5t-243 98.5t-99.5 243.5zM176 541v96h621v-96h-621zM254 1126q0 -102 66.5 -169.5t163 -67.5t163 67.5t66.5 169.5q0 100 -66.5 167t-163 67t-163 -67t-66.5 -167z" /> -<glyph unicode="»" horiz-adv-x="1073" d="M115 158l336 420l-336 421h151l336 -421l-336 -420h-151zM483 158l336 420l-336 421h152l336 -421l-336 -420h-152z" /> -<glyph unicode="¼" horiz-adv-x="1933" d="M127 1239l203 201h106v-789h191v-102h-498v102h195v592l2 49h-2q-8 -16 -43 -51l-82 -78zM528 0l689 1440h118l-686 -1440h-121zM1147 233v78l434 580h113v-555h133v-103h-133v-233h-113v233h-434zM1286 336h295v278l6 127h-4q-33 -55 -65 -100l-232 -301v-4z" /> -<glyph unicode="½" horiz-adv-x="1929" d="M127 1239l203 201h106v-789h191v-102h-498v102h195v592l2 49h-2q-8 -16 -43 -51l-82 -78zM530 0l689 1440h118l-686 -1440h-121zM1206 63q0 94 46 168t112 121t130.5 88t110.5 93.5t46 115.5q0 66 -47.5 112t-120.5 46q-100 0 -178 -96l-5 -4l-73 71q10 14 29.5 37 t87 59.5t143.5 36.5q127 0 202.5 -73.5t75.5 -186.5q0 -84 -44 -149.5t-107.5 -108.5t-127 -82t-109.5 -92t-50 -117h455v-102h-570q-6 32 -6 63z" /> -<glyph unicode="¾" horiz-adv-x="1966" d="M96 664l72 77q8 -12 25.5 -29.5t74 -47t117.5 -29.5q74 0 133.5 52t59.5 130t-60.5 125t-140.5 47h-68l-28 64l202 235l52 51v4q-39 -6 -76 -6h-316v103h539v-74l-244 -283q102 -12 178 -77.5t76 -188.5q0 -119 -88 -204t-217 -85q-55 0 -105.5 14.5t-82 34t-56 39 t-37.5 33.5zM561 0l688 1440h119l-686 -1440h-121zM1180 233v78l434 580h112v-555h134v-103h-134v-233h-112v233h-434zM1319 336h295v278l6 127h-4q-33 -55 -66 -100l-231 -301v-4z" /> -<glyph unicode="¿" horiz-adv-x="901" d="M92 -68q0 94 38 169t91 126.5t107.5 98.5t92.5 109.5t38 135.5v82h137v-88q0 -88 -37 -160.5t-89 -124t-104.5 -99.5t-89 -109.5t-36.5 -132.5q0 -100 75.5 -168t192.5 -68q61 0 123.5 21.5t93.5 42.5l31 22l75 -102q-14 -12 -40.5 -32t-112.5 -52.5t-176 -32.5 q-176 0 -293 102t-117 260zM449 872v158h157v-158h-157z" /> -<glyph unicode="À" horiz-adv-x="1261" d="M27 0l528 1440h152l528 -1440h-150l-165 459h-580l-164 -459h-149zM381 582h496l-189 522l-55 186h-4q-31 -119 -56 -186zM393 1784h162l141 -244h-127z" /> -<glyph unicode="Á" horiz-adv-x="1261" d="M27 0l528 1440h152l528 -1440h-150l-165 459h-580l-164 -459h-149zM381 582h496l-189 522l-55 186h-4q-31 -119 -56 -186zM565 1540l142 244h161l-176 -244h-127z" /> -<glyph unicode="Â" horiz-adv-x="1261" d="M27 0l528 1440h152l528 -1440h-150l-165 459h-580l-164 -459h-149zM381 582h496l-189 522l-55 186h-4q-31 -119 -56 -186zM383 1540l170 244h154l172 -244h-136l-110 166h-4l-111 -166h-135z" /> -<glyph unicode="Ã" horiz-adv-x="1261" d="M27 0l528 1440h152l528 -1440h-150l-165 459h-580l-164 -459h-149zM311 1546q0 240 189 240q59 0 103 -37t81 -74t74 -37q82 0 82 142h110q0 -240 -188 -240q-59 0 -103.5 37t-81 73t-73.5 36q-80 0 -80 -140h-113zM381 582h496l-189 522l-55 186h-4q-31 -119 -56 -186z " /> -<glyph unicode="Ä" horiz-adv-x="1261" d="M27 0l528 1440h152l528 -1440h-150l-165 459h-580l-164 -459h-149zM381 582h496l-189 522l-55 186h-4q-31 -119 -56 -186zM414 1608v176h125v-176h-125zM723 1608v176h127v-176h-127z" /> -<glyph unicode="Å" horiz-adv-x="1261" d="M27 0l528 1440h152l528 -1440h-150l-165 459h-580l-164 -459h-149zM381 582h496l-189 522l-55 186h-4q-31 -119 -56 -186zM477 1662.5q0 63.5 45 104.5t108.5 41t109.5 -41t46 -104.5t-46 -104t-109.5 -40.5t-108.5 40.5t-45 104zM565 1663q0 -29 18.5 -48.5t47.5 -19.5 q31 0 49 19.5t18 48.5q0 31 -18 50.5t-49 19.5q-29 0 -47.5 -19.5t-18.5 -50.5z" /> -<glyph unicode="Æ" horiz-adv-x="1746" d="M20 0l592 1440h985v-127h-669v-525h547v-126h-547v-535h706v-127h-848v664h-348l-268 -664h-150zM489 786h297v527h-84z" /> -<glyph unicode="Ç" horiz-adv-x="1492" d="M115 729q0 313 206.5 524t516.5 211q96 0 185 -19.5t146.5 -46t101.5 -54t64 -46.5l21 -20l-76 -104q-6 6 -19.5 17t-57.5 38.5t-91 48t-120.5 38t-149.5 17.5q-252 0 -416 -173t-164 -429q0 -262 165 -443.5t419 -181.5q82 0 159.5 19.5t131 48.5t95.5 57.5t62 47.5 l19 20l82 -100l-23 -23q-14 -14 -65.5 -52t-108.5 -67.5t-148.5 -54.5t-185.5 -27l-16 -88q63 -10 103 -48t40 -97q0 -84 -56 -123t-140 -39l-103 10v99q39 -12 86 -13q104 0 104.5 70t-116.5 70l-31 -2l39 166q-291 25 -475 236.5t-184 512.5z" /> -<glyph unicode="È" horiz-adv-x="1169" d="M209 0v1440h811v-127h-670v-525h547v-126h-547v-535h707v-127h-848zM399 1784h162l141 -244h-127z" /> -<glyph unicode="É" horiz-adv-x="1169" d="M209 0v1440h811v-127h-670v-525h547v-126h-547v-535h707v-127h-848zM571 1540l142 244h161l-176 -244h-127z" /> -<glyph unicode="Ê" horiz-adv-x="1169" d="M209 0v1440h811v-127h-670v-525h547v-126h-547v-535h707v-127h-848zM391 1540l170 244h154l172 -244h-135l-111 166h-4l-111 -166h-135z" /> -<glyph unicode="Ë" horiz-adv-x="1169" d="M209 0v1440h811v-127h-670v-525h547v-126h-547v-535h707v-127h-848zM422 1608v176h125v-176h-125zM731 1608v176h127v-176h-127z" /> -<glyph unicode="Ì" horiz-adv-x="559" d="M43 1784h162l141 -244h-127zM209 0v1440h141v-1440h-141z" /> -<glyph unicode="Í" horiz-adv-x="559" d="M209 0v1440h141v-1440h-141zM213 1540l141 244h162l-176 -244h-127z" /> -<glyph unicode="Î" horiz-adv-x="559" d="M33 1540l170 244h153l172 -244h-135l-110 166h-4l-111 -166h-135zM209 0v1440h141v-1440h-141z" /> -<glyph unicode="Ï" horiz-adv-x="559" d="M63 1608v176h125v-176h-125zM209 0v1440h141v-1440h-141zM373 1608v176h127v-176h-127z" /> -<glyph unicode="Ð" horiz-adv-x="1544" d="M119 662v122h123v656h463q330 0 526 -191.5t196 -527.5q0 -340 -196.5 -530.5t-525.5 -190.5h-463v662h-123zM383 127h307q270 0 430 154.5t160 439.5q0 283 -159.5 437.5t-430.5 154.5h-307v-529h342v-122h-342v-535z" /> -<glyph unicode="Ñ" horiz-adv-x="1542" d="M209 0v1440h137l735 -1037l119 -194h4q-12 119 -12 194v1037h141v-1440h-137l-735 1036l-119 195h-4q12 -119 12 -195v-1036h-141zM453 1546q0 240 188 240q59 0 103 -37t81 -74t74 -37q82 0 82 142h111q0 -240 -189 -240q-59 0 -103 37t-81 73t-74 36q-80 0 -80 -140 h-112z" /> -<glyph unicode="Ò" horiz-adv-x="1687" d="M111 729q0 309 213 522t520 213t520 -213t213 -522q0 -315 -214 -534.5t-519 -219.5t-519 219.5t-214 534.5zM258 729q0 -262 170 -442.5t416 -180.5q244 0 415 180.5t171 442.5q0 256 -171.5 430t-414.5 174q-246 0 -416 -174t-170 -430zM604 1784h162l141 -244h-127z " /> -<glyph unicode="Ó" horiz-adv-x="1687" d="M111 729q0 309 213 522t520 213t520 -213t213 -522q0 -315 -214 -534.5t-519 -219.5t-519 219.5t-214 534.5zM258 729q0 -262 170 -442.5t416 -180.5q244 0 415 180.5t171 442.5q0 256 -171.5 430t-414.5 174q-246 0 -416 -174t-170 -430zM776 1540l142 244h161 l-176 -244h-127z" /> -<glyph unicode="Ô" horiz-adv-x="1687" d="M111 729q0 309 213 522t520 213t520 -213t213 -522q0 -315 -214 -534.5t-519 -219.5t-519 219.5t-214 534.5zM258 729q0 -262 170 -442.5t416 -180.5q244 0 415 180.5t171 442.5q0 256 -171.5 430t-414.5 174q-246 0 -416 -174t-170 -430zM596 1540l170 244h154l172 -244 h-136l-110 166h-4l-111 -166h-135z" /> -<glyph unicode="Õ" horiz-adv-x="1687" d="M111 729q0 309 213 522t520 213t520 -213t213 -522q0 -315 -214 -534.5t-519 -219.5t-519 219.5t-214 534.5zM258 729q0 -262 170 -442.5t416 -180.5q244 0 415 180.5t171 442.5q0 256 -171.5 430t-414.5 174q-246 0 -416 -174t-170 -430zM524 1546q0 240 189 240 q59 0 103 -37t81 -74t74 -37q82 0 82 142h110q0 -240 -188 -240q-59 0 -103.5 37t-81 73t-73.5 36q-80 0 -80 -140h-113z" /> -<glyph unicode="Ö" horiz-adv-x="1687" d="M111 729q0 309 213 522t520 213t520 -213t213 -522q0 -315 -214 -534.5t-519 -219.5t-519 219.5t-214 534.5zM258 729q0 -262 170 -442.5t416 -180.5q244 0 415 180.5t171 442.5q0 256 -171.5 430t-414.5 174q-246 0 -416 -174t-170 -430zM627 1608v176h125v-176h-125z M936 1608v176h127v-176h-127z" /> -<glyph unicode="×" horiz-adv-x="1341" d="M147 84l443 498l-443 497l84 84l439 -493l438 493l84 -84l-444 -497l444 -498l-84 -84l-438 494l-439 -494z" /> -<glyph unicode="Ø" horiz-adv-x="1693" d="M115 729q0 309 213 522t520 213q207 0 387 -108l96 135l84 -61l-96 -136q123 -102 192.5 -249.5t69.5 -315.5q0 -315 -214 -534.5t-519 -219.5q-215 0 -393 115l-99 -139l-86 59l101 142q-121 104 -188.5 254.5t-67.5 322.5zM262 729q0 -279 191 -463l702 979 q-143 88 -307 88q-246 0 -416 -174t-170 -430zM535 201q143 -94 313 -95q244 0 415 180.5t171 442.5q0 274 -195 453z" /> -<glyph unicode="Ù" horiz-adv-x="1482" d="M190 502v938h144v-936q0 -184 110.5 -291t296.5 -107q188 0 299 108t111 294v932h141v-938q0 -238 -151.5 -382.5t-397.5 -144.5q-248 0 -400.5 144.5t-152.5 382.5zM504 1784h162l141 -244h-127z" /> -<glyph unicode="Ú" horiz-adv-x="1482" d="M190 502v938h144v-936q0 -184 110.5 -291t296.5 -107q188 0 299 108t111 294v932h141v-938q0 -238 -151.5 -382.5t-397.5 -144.5q-248 0 -400.5 144.5t-152.5 382.5zM676 1540l141 244h162l-176 -244h-127z" /> -<glyph unicode="Û" horiz-adv-x="1482" d="M190 502v938h144v-936q0 -184 110.5 -291t296.5 -107q188 0 299 108t111 294v932h141v-938q0 -238 -151.5 -382.5t-397.5 -144.5q-248 0 -400.5 144.5t-152.5 382.5zM494 1540l170 244h153l172 -244h-135l-111 166h-4l-110 -166h-135z" /> -<glyph unicode="Ü" horiz-adv-x="1482" d="M190 502v938h144v-936q0 -184 110.5 -291t296.5 -107q188 0 299 108t111 294v932h141v-938q0 -238 -151.5 -382.5t-397.5 -144.5q-248 0 -400.5 144.5t-152.5 382.5zM524 1608v176h125v-176h-125zM834 1608v176h127v-176h-127z" /> -<glyph unicode="Ý" horiz-adv-x="1175" d="M31 1440h162l305 -522q43 -74 88 -173h4q43 96 88 173l305 522h160l-484 -822v-618h-143v618zM520 1540l142 244h161l-176 -244h-127z" /> -<glyph unicode="Þ" horiz-adv-x="1226" d="M209 0v1440h141v-256h357q195 0 319.5 -119t124.5 -317q0 -197 -126 -318t-323 -121h-352v-309h-141zM350 436h338q145 0 230.5 83t85.5 228.5t-84 227.5t-230 82h-340v-621z" /> -<glyph unicode="ß" horiz-adv-x="1173" d="M168 0v1087q0 174 123 275.5t289 101.5q160 0 259 -90t99 -215q0 -72 -36 -134t-78 -99t-77.5 -82t-35.5 -88q0 -45 62.5 -97.5t137 -96.5t137 -119.5t62.5 -163.5q0 -139 -96 -216t-236 -77q-86 0 -161.5 16t-108.5 33l-33 16v133q123 -74 293 -73q84 0 142.5 44 t58.5 128q0 63 -62.5 123.5t-138.5 101.5t-138.5 106.5t-62.5 137.5q0 59 36 114.5t78 92t78 90t36 108.5q0 72 -58.5 126t-163.5 54q-106 0 -186 -69.5t-80 -190.5v-1077h-139z" /> -<glyph unicode="à" d="M84 281q0 356 631 356h57v27q0 266 -256 266q-76 0 -148.5 -24.5t-107.5 -49.5l-35 -25l-65 107q14 12 43.5 31.5t125 52.5t197.5 33q186 0 285.5 -101.5t99.5 -294.5v-659h-133v113l4 86h-4q-4 -8 -11 -23.5t-36 -54.5t-64.5 -67.5t-98 -53.5t-134.5 -25 q-141 0 -245.5 80.5t-104.5 225.5zM227 289q0 -78 60.5 -136.5t169.5 -58.5q139 0 227 119t88 264v45h-59q-86 0 -148.5 -5t-150.5 -25.5t-137.5 -71.5t-49.5 -131zM291 1440h162l141 -244h-127z" /> -<glyph unicode="á" d="M84 281q0 356 631 356h57v27q0 266 -256 266q-76 0 -148.5 -24.5t-107.5 -49.5l-35 -25l-65 107q14 12 43.5 31.5t125 52.5t197.5 33q186 0 285.5 -101.5t99.5 -294.5v-659h-133v113l4 86h-4q-4 -8 -11 -23.5t-36 -54.5t-64.5 -67.5t-98 -53.5t-134.5 -25 q-141 0 -245.5 80.5t-104.5 225.5zM227 289q0 -78 60.5 -136.5t169.5 -58.5q139 0 227 119t88 264v45h-59q-86 0 -148.5 -5t-150.5 -25.5t-137.5 -71.5t-49.5 -131zM461 1196l141 244h162l-176 -244h-127z" /> -<glyph unicode="â" d="M84 281q0 356 631 356h57v27q0 266 -256 266q-76 0 -148.5 -24.5t-107.5 -49.5l-35 -25l-65 107q14 12 43.5 31.5t125 52.5t197.5 33q186 0 285.5 -101.5t99.5 -294.5v-659h-133v113l4 86h-4q-4 -8 -11 -23.5t-36 -54.5t-64.5 -67.5t-98 -53.5t-134.5 -25 q-141 0 -245.5 80.5t-104.5 225.5zM227 289q0 -78 60.5 -136.5t169.5 -58.5q139 0 227 119t88 264v45h-59q-86 0 -148.5 -5t-150.5 -25.5t-137.5 -71.5t-49.5 -131zM283 1196l170 244h153l172 -244h-135l-111 166h-4l-110 -166h-135z" /> -<glyph unicode="ã" d="M84 281q0 356 631 356h57v27q0 266 -256 266q-76 0 -148.5 -24.5t-107.5 -49.5l-35 -25l-65 107q14 12 43.5 31.5t125 52.5t197.5 33q186 0 285.5 -101.5t99.5 -294.5v-659h-133v113l4 86h-4q-4 -8 -11 -23.5t-36 -54.5t-64.5 -67.5t-98 -53.5t-134.5 -25 q-141 0 -245.5 80.5t-104.5 225.5zM211 1202q0 240 188 240q59 0 103.5 -37t81.5 -74t73 -37q82 0 82 142h111q0 -240 -189 -240q-59 0 -103 37t-81 72.5t-74 35.5q-80 0 -79 -139h-113zM227 289q0 -78 60.5 -136.5t169.5 -58.5q139 0 227 119t88 264v45h-59 q-86 0 -148.5 -5t-150.5 -25.5t-137.5 -71.5t-49.5 -131z" /> -<glyph unicode="ä" d="M84 281q0 356 631 356h57v27q0 266 -256 266q-76 0 -148.5 -24.5t-107.5 -49.5l-35 -25l-65 107q14 12 43.5 31.5t125 52.5t197.5 33q186 0 285.5 -101.5t99.5 -294.5v-659h-133v113l4 86h-4q-4 -8 -11 -23.5t-36 -54.5t-64.5 -67.5t-98 -53.5t-134.5 -25 q-141 0 -245.5 80.5t-104.5 225.5zM227 289q0 -78 60.5 -136.5t169.5 -58.5q139 0 227 119t88 264v45h-59q-86 0 -148.5 -5t-150.5 -25.5t-137.5 -71.5t-49.5 -131zM313 1264v176h125v-176h-125zM623 1264v176h127v-176h-127z" /> -<glyph unicode="å" d="M84 281q0 356 631 356h57v27q0 266 -256 266q-76 0 -148.5 -24.5t-107.5 -49.5l-35 -25l-65 107q14 12 43.5 31.5t125 52.5t197.5 33q186 0 285.5 -101.5t99.5 -294.5v-659h-133v113l4 86h-4q-4 -8 -11 -23.5t-36 -54.5t-64.5 -67.5t-98 -53.5t-134.5 -25 q-141 0 -245.5 80.5t-104.5 225.5zM227 289q0 -78 60.5 -136.5t169.5 -58.5q139 0 227 119t88 264v45h-59q-86 0 -148.5 -5t-150.5 -25.5t-137.5 -71.5t-49.5 -131zM375 1318.5q0 63.5 45 104.5t108.5 41t109.5 -41t46 -104.5t-46 -104t-109.5 -40.5t-108.5 40.5t-45 104z M463 1319q0 -29 18.5 -48.5t46.5 -19.5q31 0 49.5 19.5t18.5 48.5q0 31 -18.5 50.5t-49.5 19.5q-29 0 -47 -19.5t-18 -50.5z" /> -<glyph unicode="æ" horiz-adv-x="1781" d="M84 281q0 70 23.5 125t58.5 90.5t91 62.5t105.5 40t119 20.5t113.5 8.5t107 1h68v35q0 266 -262 266q-154 0 -281 -94l-4 -5l-63 105q14 12 42.5 32.5t121 53.5t192.5 33q281 0 348 -213h4q127 213 389 213q199 0 312.5 -134.5t113.5 -328.5l-4 -78h-774 q4 -199 110.5 -306.5t274.5 -107.5q82 0 160 32t115 63l37 30l63 -106q-16 -16 -47 -40t-130 -64t-204 -40q-158 0 -276.5 76t-176.5 211h-4q-6 -23 -19 -51.5t-46 -72.5t-73 -77.5t-106.5 -59.5t-144.5 -26q-150 0 -252 81.5t-102 224.5zM227 289q0 -80 61.5 -137.5 t170.5 -57.5q139 0 226 120t87 265v35h-121q-82 0 -142 -6t-132 -26.5t-111 -69.5t-39 -123zM913 629h629q-6 152 -89 229.5t-202 77.5q-133 0 -223 -78.5t-115 -228.5z" /> -<glyph unicode="ç" horiz-adv-x="1126" d="M98 514q0 236 156 388.5t385 152.5q221 0 360 -131l17 -17l-72 -104q-12 14 -36.5 34.5t-103.5 55.5t-161 35q-172 0 -286.5 -116t-114.5 -298q0 -180 116.5 -297t288.5 -117q59 0 114.5 15.5t92.5 36t66.5 42t42.5 35.5l14 17l63 -109q-14 -16 -43.5 -42.5t-129 -70.5 t-210.5 -49l-16 -88q63 -10 103 -48t40 -97q0 -84 -56 -123t-140 -39l-103 10v99q39 -12 86 -13q104 0 104.5 70t-116.5 70l-31 -2l39 166q-207 23 -338 170t-131 364z" /> -<glyph unicode="è" horiz-adv-x="1132" d="M96 514q0 246 146.5 393.5t361.5 147.5q205 0 317.5 -136.5t112.5 -338.5l-4 -72h-790q4 -190 117.5 -299t281.5 -109q172 0 305 117l8 8l64 -106q-16 -16 -48 -40t-131.5 -64t-201.5 -40q-231 0 -385 151.5t-154 387.5zM246 623h647q-6 154 -88 234.5t-205 80.5 q-135 0 -232 -82.5t-122 -232.5zM369 1440h161l142 -244h-127z" /> -<glyph unicode="é" horiz-adv-x="1132" d="M96 514q0 246 146.5 393.5t361.5 147.5q205 0 317.5 -136.5t112.5 -338.5l-4 -72h-790q4 -190 117.5 -299t281.5 -109q172 0 305 117l8 8l64 -106q-16 -16 -48 -40t-131.5 -64t-201.5 -40q-231 0 -385 151.5t-154 387.5zM246 623h647q-6 154 -88 234.5t-205 80.5 q-135 0 -232 -82.5t-122 -232.5zM539 1196l141 244h162l-176 -244h-127z" /> -<glyph unicode="ê" horiz-adv-x="1132" d="M96 514q0 246 146.5 393.5t361.5 147.5q205 0 317.5 -136.5t112.5 -338.5l-4 -72h-790q4 -190 117.5 -299t281.5 -109q172 0 305 117l8 8l64 -106q-16 -16 -48 -40t-131.5 -64t-201.5 -40q-231 0 -385 151.5t-154 387.5zM246 623h647q-6 154 -88 234.5t-205 80.5 q-135 0 -232 -82.5t-122 -232.5zM358 1196l170 244h154l172 -244h-135l-111 166h-4l-110 -166h-136z" /> -<glyph unicode="ë" horiz-adv-x="1132" d="M96 514q0 246 146.5 393.5t361.5 147.5q205 0 317.5 -136.5t112.5 -338.5l-4 -72h-790q4 -190 117.5 -299t281.5 -109q172 0 305 117l8 8l64 -106q-16 -16 -48 -40t-131.5 -64t-201.5 -40q-231 0 -385 151.5t-154 387.5zM246 623h647q-6 154 -88 234.5t-205 80.5 q-135 0 -232 -82.5t-122 -232.5zM389 1264v176h125v-176h-125zM698 1264v176h127v-176h-127z" /> -<glyph unicode="ì" horiz-adv-x="475" d="M0 1440h162l141 -244h-127zM168 0v1030h139v-1030h-139z" /> -<glyph unicode="í" horiz-adv-x="475" d="M168 0v1030h139v-1030h-139zM172 1196l141 244h162l-176 -244h-127z" /> -<glyph unicode="î" horiz-adv-x="475" d="M-8 1196l170 244h153l172 -244h-135l-110 166h-4l-111 -166h-135zM168 0v1030h139v-1030h-139z" /> -<glyph unicode="ï" horiz-adv-x="475" d="M23 1264v176h124v-176h-124zM168 0v1030h139v-1030h-139zM332 1264v176h127v-176h-127z" /> -<glyph unicode="ð" horiz-adv-x="1204" d="M100 475q0 197 130 339t360 142q178 0 287 -102l8 -8h4q-70 199 -254 325l-361 -163l-26 98l276 129q-131 68 -291 104l41 119q236 -59 402 -158l268 121l27 -98l-199 -92q309 -242 309 -672q0 -106 -29.5 -206.5t-89 -186.5t-160 -138.5t-229.5 -52.5q-215 0 -344 149.5 t-129 350.5zM244 473q0 -152 90 -262.5t244 -110.5q176 0 268 132.5t92 299.5q0 133 -92 219.5t-242 86.5q-174 0 -267 -107.5t-93 -257.5z" /> -<glyph unicode="ñ" horiz-adv-x="1214" d="M168 1030h137v-153l-4 -82h4q37 94 143.5 177t268.5 83q184 0 264 -100.5t80 -299.5v-655h-139v618q0 145 -44 225.5t-180 80.5q-131 0 -235.5 -81t-138.5 -210q-16 -57 -17 -139v-494h-139v1030zM317 1202q0 240 189 240q59 0 103 -37t81 -74t74 -37q82 0 82 142h110 q0 -240 -188 -240q-59 0 -103 37t-81 72.5t-74 35.5q-80 0 -80 -139h-113z" /> -<glyph unicode="ò" horiz-adv-x="1273" d="M92 520q0 227 159 381t386 154t386 -153.5t159 -381.5q0 -231 -159 -388t-386 -157t-386 157t-159 388zM236 520q0 -178 116.5 -299t284.5 -121t284.5 121t116.5 299q0 174 -116.5 291t-284.5 117t-284.5 -117t-116.5 -291zM399 1440h162l141 -244h-127z" /> -<glyph unicode="ó" horiz-adv-x="1273" d="M92 520q0 227 159 381t386 154t386 -153.5t159 -381.5q0 -231 -159 -388t-386 -157t-386 157t-159 388zM236 520q0 -178 116.5 -299t284.5 -121t284.5 121t116.5 299q0 174 -116.5 291t-284.5 117t-284.5 -117t-116.5 -291zM571 1196l142 244h161l-176 -244h-127z" /> -<glyph unicode="ô" horiz-adv-x="1273" d="M92 520q0 227 159 381t386 154t386 -153.5t159 -381.5q0 -231 -159 -388t-386 -157t-386 157t-159 388zM236 520q0 -178 116.5 -299t284.5 -121t284.5 121t116.5 299q0 174 -116.5 291t-284.5 117t-284.5 -117t-116.5 -291zM389 1196l170 244h154l172 -244h-135l-111 166 h-4l-111 -166h-135z" /> -<glyph unicode="õ" horiz-adv-x="1273" d="M92 520q0 227 159 381t386 154t386 -153.5t159 -381.5q0 -231 -159 -388t-386 -157t-386 157t-159 388zM236 520q0 -178 116.5 -299t284.5 -121t284.5 121t116.5 299q0 174 -116.5 291t-284.5 117t-284.5 -117t-116.5 -291zM317 1202q0 240 189 240q59 0 103 -37t81 -74 t74 -37q82 0 82 142h110q0 -240 -188 -240q-59 0 -103 37t-81 72.5t-74 35.5q-80 0 -80 -139h-113z" /> -<glyph unicode="ö" horiz-adv-x="1273" d="M92 520q0 227 159 381t386 154t386 -153.5t159 -381.5q0 -231 -159 -388t-386 -157t-386 157t-159 388zM236 520q0 -178 116.5 -299t284.5 -121t284.5 121t116.5 299q0 174 -116.5 291t-284.5 117t-284.5 -117t-116.5 -291zM420 1264v176h125v-176h-125zM729 1264v176 h127v-176h-127z" /> -<glyph unicode="÷" horiz-adv-x="1323" d="M160 522v119h1003v-119h-1003zM584 125v151h153v-151h-153zM584 887v151h153v-151h-153z" /> -<glyph unicode="ø" horiz-adv-x="1277" d="M94 520q0 227 159 381t386 154q150 0 279 -74l79 111l84 -62l-77 -110q180 -158 180 -400q0 -231 -159 -388t-386 -157q-139 0 -264 66l-78 -109l-84 62l76 104q-195 162 -195 422zM238 520q0 -188 129 -311l475 663q-94 55 -203 56q-168 0 -284.5 -117t-116.5 -291z M451 147q84 -47 188 -47q168 0 284.5 121t116.5 299q0 172 -116 289z" /> -<glyph unicode="ù" horiz-adv-x="1204" d="M154 375v655h139v-618q0 -145 44 -225.5t179 -80.5q170 0 275.5 127t105.5 304v493h139v-1030h-135v154l4 82h-4q-39 -94 -144.5 -177.5t-258.5 -83.5q-180 0 -262 98.5t-82 301.5zM358 1440h162l142 -244h-127z" /> -<glyph unicode="ú" horiz-adv-x="1204" d="M154 375v655h139v-618q0 -145 44 -225.5t179 -80.5q170 0 275.5 127t105.5 304v493h139v-1030h-135v154l4 82h-4q-39 -94 -144.5 -177.5t-258.5 -83.5q-180 0 -262 98.5t-82 301.5zM528 1196l142 244h161l-176 -244h-127z" /> -<glyph unicode="û" horiz-adv-x="1204" d="M154 375v655h139v-618q0 -145 44 -225.5t179 -80.5q170 0 275.5 127t105.5 304v493h139v-1030h-135v154l4 82h-4q-39 -94 -144.5 -177.5t-258.5 -83.5q-180 0 -262 98.5t-82 301.5zM348 1196l170 244h154l172 -244h-135l-111 166h-4l-111 -166h-135z" /> -<glyph unicode="ü" horiz-adv-x="1204" d="M154 375v655h139v-618q0 -145 44 -225.5t179 -80.5q170 0 275.5 127t105.5 304v493h139v-1030h-135v154l4 82h-4q-39 -94 -144.5 -177.5t-258.5 -83.5q-180 0 -262 98.5t-82 301.5zM379 1264v176h125v-176h-125zM688 1264v176h127v-176h-127z" /> -<glyph unicode="ý" horiz-adv-x="1021" d="M14 -369l54 111q57 -47 122 -47q121 0 195 168l64 145l-431 1022h154l303 -751l37 -109h4q14 57 35 109l297 751h151l-507 -1245q-41 -100 -119 -157.5t-178 -57.5q-105 0 -181 61zM446 1196l142 244h162l-177 -244h-127z" /> -<glyph unicode="þ" horiz-adv-x="1206" d="M168 -410v1850h139v-498l-2 -84h4l13 19q12 18 26 38.5t44 46t65 45t87 34t111 14.5q207 0 329 -149.5t122 -389.5q0 -242 -129 -391.5t-332 -149.5q-70 0 -131 20.5t-97 49.5t-62.5 57.5t-37.5 49.5l-10 20h-4q4 -37 4 -90v-492h-139zM303 514q0 -174 89 -294t241 -120 q141 0 235.5 114t94.5 302q0 184 -90.5 298t-233.5 114q-145 0 -240.5 -102.5t-95.5 -311.5z" /> -<glyph unicode="ÿ" horiz-adv-x="1021" d="M14 -369l54 111q57 -47 122 -47q121 0 195 168l64 145l-431 1022h154l303 -751l37 -109h4q14 57 35 109l297 751h151l-507 -1245q-41 -100 -119 -157.5t-178 -57.5q-105 0 -181 61zM297 1264v176h125v-176h-125zM606 1264v176h127v-176h-127z" /> -<glyph unicode="Œ" horiz-adv-x="1951" d="M113 721q0 313 207.5 526t525.5 213q45 0 129 -10t115 -10h710v-127h-667v-525h544v-126h-544v-535h704v-127h-745q-29 0 -115 -10t-131 -10q-317 0 -525 213t-208 528zM260 721q0 -262 163 -437t423 -175l143 14v1192q-66 16 -143 16q-260 0 -423 -174t-163 -436z" /> -<glyph unicode="œ" horiz-adv-x="2074" d="M94 512q0 240 158 391.5t383 151.5q154 0 275.5 -74t189.5 -203h4q59 131 175 204t265 73q205 0 318.5 -136.5t113.5 -338.5l-4 -72h-790q8 -195 121.5 -301.5t277.5 -106.5q84 0 162 32t112 63l37 30l66 -106q-16 -16 -48 -40t-131.5 -64t-203.5 -40q-160 0 -283 75 t-186 206h-4q-66 -131 -188.5 -206t-278.5 -75q-225 0 -383 149.5t-158 387.5zM238 512q0 -182 115.5 -297t283.5 -115t283.5 117t115.5 303q0 182 -116.5 295t-282.5 113q-168 0 -283.5 -116t-115.5 -300zM1188 623h645q-6 154 -87 234.5t-204 80.5q-135 0 -232 -82.5 t-122 -232.5z" /> -<glyph unicode="Ÿ" horiz-adv-x="1175" d="M31 1440h162l305 -522q43 -74 88 -173h4q43 96 88 173l305 522h160l-484 -822v-618h-143v618zM360 1608v176h125v-176h-125zM670 1608v176h127v-176h-127z" /> -<glyph unicode="ˆ" horiz-adv-x="1032" d="M268 1540l170 244h154l172 -244h-135l-111 166h-4l-111 -166h-135z" /> -<glyph unicode="˜" horiz-adv-x="1032" d="M197 1546q0 240 188 240q59 0 103 -37t81 -74t74 -37q82 0 82 142h111q0 -240 -189 -240q-59 0 -103 37t-81 73t-74 36q-80 0 -80 -140h-112z" /> -<glyph unicode="–" horiz-adv-x="1449" d="M213 522v119h1024v-119h-1024z" /> -<glyph unicode="—" horiz-adv-x="1859" d="M213 522v119h1434v-119h-1434z" /> -<glyph unicode="‘" horiz-adv-x="440" d="M115 1106l116 352h111l-80 -352h-147z" /> -<glyph unicode="’" horiz-adv-x="428" d="M117 1108l80 352h147l-115 -352h-112z" /> -<glyph unicode="‚" horiz-adv-x="487" d="M104 -184l80 352h146l-115 -352h-111z" /> -<glyph unicode="“" horiz-adv-x="686" d="M115 1106l116 352h111l-80 -352h-147zM360 1106l115 352h113l-80 -352h-148z" /> -<glyph unicode="”" horiz-adv-x="673" d="M117 1108l80 352h147l-115 -352h-112zM362 1108l80 352h148l-115 -352h-113z" /> -<glyph unicode="„" horiz-adv-x="729" d="M104 -184l80 352h146l-115 -352h-111zM346 -184l80 352h145l-114 -352h-111z" /> -<glyph unicode="•" horiz-adv-x="821" d="M119 596q0 121 86 207t206.5 86t205.5 -86t85 -207t-85 -207t-205.5 -86t-206.5 86t-86 207z" /> -<glyph unicode="…" horiz-adv-x="1464" d="M172 0v164h158v-164h-158zM653 0v164h158v-164h-158zM1135 0v164h157v-164h-157z" /> -<glyph unicode="‹" horiz-adv-x="702" d="M102 578l336 421h150l-336 -421l336 -420h-150z" /> -<glyph unicode="›" horiz-adv-x="704" d="M115 158l336 420l-336 421h151l336 -421l-336 -420h-151z" /> -<glyph unicode="€" horiz-adv-x="1208" d="M84 545v104h113q-12 72 0 166h-113v105h131q61 242 249.5 393t438.5 151l195 -24l-35 -133q-76 23 -162 22q-195 0 -338 -112.5t-196 -296.5h626l-20 -105h-629q-12 -78 -2 -166h600l-20 -104h-557q49 -195 195.5 -314.5t344.5 -119.5q45 0 91 7t69 13l22 8l33 -133 q-94 -31 -217 -31q-258 0 -447.5 159t-244.5 411h-127z" /> -<glyph unicode="™" horiz-adv-x="1908" d="M55 1333v107h758v-107h-321v-790h-117v790h-320zM887 543l71 897h107l235 -514q18 -39 29 -84h4q10 45 29 84l235 514h107l70 -897h-113l-51 608l2 59h-4l-230 -499h-94l-229 499h-4l2 -59l-52 -608h-114z" /> -<glyph unicode="" horiz-adv-x="1030" d="M0 1030h1030v-1030h-1030v1030z" /> -<glyph unicode="fi" horiz-adv-x="1130" d="M86 913v117h129v37q0 119 38 202t99.5 118.5t112.5 49t106 13.5l64 -4v-125q-20 4 -49 4q-37 0 -71 -9t-74 -32.5t-63.5 -80t-23.5 -136.5v-37h609v-1030h-140v913h-469v-913h-139v913h-129zM819 1266v174h146v-174h-146z" /> -<glyph unicode="fl" horiz-adv-x="1161" d="M86 901v117h129v49q0 119 38 202t99.5 118.5t112.5 49t106 13.5l64 -4v-125q-20 4 -49 4q-37 0 -71 -9t-74 -32.5t-63.5 -80t-23.5 -136.5v-49h264v-117h-264v-901h-139v901h-129zM813 244v1196h139v-1166q0 -156 115 -155l35 2v-125q-25 -4 -51 -4q-238 0 -238 252z" /> -<glyph unicode="ffi" horiz-adv-x="1785" d="M86 913v117h129v37q0 119 38 202t99.5 118.5t112.5 49t106 13.5l64 -4v-125q-20 4 -49 4q-37 0 -71 -9t-74 -32.5t-63.5 -80t-23.5 -136.5v-37h516v37q0 119 38 202t99.5 118.5t112.5 49t107 13.5l63 -4v-125q-20 4 -49 4q-37 0 -70.5 -9t-73.5 -32.5t-63.5 -80 t-23.5 -136.5v-37h608v-1030h-139v913h-469v-913h-140v913h-516v-913h-139v913h-129zM1475 1266v174h145v-174h-145z" /> -<glyph unicode="ffl" horiz-adv-x="1816" d="M86 913v117h129v37q0 119 38 202t99.5 118.5t112.5 49t106 13.5l64 -4v-125q-20 4 -49 4q-37 0 -71 -9t-74 -32.5t-63.5 -80t-23.5 -136.5v-37h516v37q0 119 38 202t99.5 118.5t112.5 49t107 13.5l63 -4v-125q-20 4 -49 4q-37 0 -70.5 -9t-73.5 -32.5t-63.5 -80 t-23.5 -136.5v-37h264v-117h-264v-913h-140v913h-516v-913h-139v913h-129zM1468 244v1196h140v-1166q0 -156 114 -155l35 2v-125q-25 -4 -51 -4q-238 0 -238 252z" /> -</font> -</defs></svg>
\ No newline at end of file diff --git a/web/cobrands/stevenage/fonts/MuseoSans_300-webfont.ttf b/web/cobrands/stevenage/fonts/MuseoSans_300-webfont.ttf Binary files differdeleted file mode 100755 index 0a4444b76..000000000 --- a/web/cobrands/stevenage/fonts/MuseoSans_300-webfont.ttf +++ /dev/null diff --git a/web/cobrands/stevenage/fonts/MuseoSans_300-webfont.woff b/web/cobrands/stevenage/fonts/MuseoSans_300-webfont.woff Binary files differdeleted file mode 100755 index 22110a14e..000000000 --- a/web/cobrands/stevenage/fonts/MuseoSans_300-webfont.woff +++ /dev/null diff --git a/web/cobrands/stevenage/fonts/MuseoSans_300_Italic-webfont.eot b/web/cobrands/stevenage/fonts/MuseoSans_300_Italic-webfont.eot Binary files differdeleted file mode 100755 index 3a35076a1..000000000 --- a/web/cobrands/stevenage/fonts/MuseoSans_300_Italic-webfont.eot +++ /dev/null diff --git a/web/cobrands/stevenage/fonts/MuseoSans_300_Italic-webfont.svg b/web/cobrands/stevenage/fonts/MuseoSans_300_Italic-webfont.svg deleted file mode 100755 index b848d3756..000000000 --- a/web/cobrands/stevenage/fonts/MuseoSans_300_Italic-webfont.svg +++ /dev/null @@ -1,227 +0,0 @@ -<?xml version="1.0" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" > -<svg xmlns="http://www.w3.org/2000/svg"> -<metadata> -This is a custom SVG webfont generated by Fontspring. -</metadata> -<defs> -<font id="MuseoSans300Italic" horiz-adv-x="1255" > -<font-face units-per-em="2048" ascent="1536" descent="-512" /> -<missing-glyph horiz-adv-x="555" /> -<glyph unicode=" " horiz-adv-x="555" /> -<glyph unicode="	" horiz-adv-x="555" /> -<glyph unicode=" " horiz-adv-x="555" /> -<glyph unicode="!" horiz-adv-x="632" d="M117 0l33 162h161l-32 -162h-162zM205 377l201 1063h145l-215 -1063h-131z" /> -<glyph unicode=""" horiz-adv-x="647" d="M236 1114l67 346h119l-66 -346h-120zM485 1114l66 346h121l-68 -346h-119z" /> -<glyph unicode="#" horiz-adv-x="1480" d="M53 399l43 115h287l149 401h-286l41 115h286l152 410h129l-152 -410h355l151 410h127l-151 -410h284l-41 -115h-284l-150 -401h283l-41 -115h-285l-147 -399h-129l149 399h-354l-147 -399h-129l149 399h-289zM512 514h352l150 401h-355z" /> -<glyph unicode="$" horiz-adv-x="1142" d="M41 160l96 100q4 -6 14.5 -16.5t43 -36t70.5 -45t98.5 -35.5t125.5 -16q135 0 238.5 82.5t103.5 212.5q0 80 -61 140t-149.5 102t-175.5 88t-148 123t-61 181q0 160 132 284t324 138l39 191h115l-37 -193q94 -10 172 -44t109 -62l30 -29l-84 -108q-12 12 -35.5 30.5 t-101.5 50t-162 31.5q-150 0 -253 -90t-103 -199q0 -72 61.5 -127t149.5 -97t175 -90t148.5 -129t61.5 -191q0 -168 -131 -294t-328 -137l-35 -186h-114l34 193q-111 12 -200.5 56t-124.5 83z" /> -<glyph unicode="%" horiz-adv-x="1505" d="M18 0l1360 1440h160l-1364 -1440h-156zM221 1147q0 121 102.5 219t231.5 98q113 0 182.5 -69.5t69.5 -180.5q0 -125 -101.5 -222t-230.5 -97q-117 0 -185.5 68.5t-68.5 183.5zM344 1145q0 -57 39 -96t100 -39q80 0 140.5 61.5t60.5 142.5q0 57 -38 96.5t-99 39.5 q-80 0 -141.5 -62.5t-61.5 -142.5zM741 227q0 121 102.5 219.5t231.5 98.5q115 0 183.5 -69.5t68.5 -180.5q0 -125 -101.5 -222.5t-230.5 -97.5q-115 0 -184.5 68.5t-69.5 183.5zM864 225q0 -59 39 -97t101 -38q80 0 140 60.5t60 142.5q0 59 -38 98t-99 39 q-78 0 -140.5 -62.5t-62.5 -142.5z" /> -<glyph unicode="&" horiz-adv-x="1378" d="M76 342q0 145 97 270t249 164v4q-6 2 -16.5 7.5t-35 24.5t-44 45t-36 73t-16.5 104q0 188 140.5 309t349.5 121l176 -26l-57 -113q-68 14 -119 14q-141 0 -242.5 -85t-101.5 -222q0 -201 266 -201h303l41 203h139l-39 -203h195l-25 -126h-194l-43 -211 q-104 -518 -553 -519q-205 0 -319.5 100.5t-114.5 266.5zM223 346q0 -104 77 -170.5t212 -66.5q334 0 412 389l41 207h-303q-182 0 -310.5 -94.5t-128.5 -264.5z" /> -<glyph unicode="'" horiz-adv-x="401" d="M236 1114l67 346h121l-66 -346h-122z" /> -<glyph unicode="(" horiz-adv-x="587" d="M143 350q0 637 418 1145h135q-424 -535 -424 -1149q0 -289 97 -541h-125q-101 258 -101 545z" /> -<glyph unicode=")" horiz-adv-x="589" d="M-94 -195q424 535 424 1149q0 289 -97 541h125q100 -258 101 -545q0 -637 -418 -1145h-135z" /> -<glyph unicode="*" horiz-adv-x="956" d="M178 1108l64 125l274 -109l49 316h140l-76 -316l319 107l19 -129l-324 -90v-4l141 -242l-114 -78l-127 260h-4l-226 -258l-100 80l242 250v4z" /> -<glyph unicode="+" horiz-adv-x="1390" d="M143 522l23 119h471l104 522h125l-102 -522h471l-23 -119h-471l-102 -522h-125l102 522h-473z" /> -<glyph unicode="," horiz-adv-x="507" d="M-78 -199l191 367h157l-223 -367h-125z" /> -<glyph unicode="-" horiz-adv-x="999" d="M190 518l23 127h582l-25 -127h-580z" /> -<glyph unicode="." horiz-adv-x="497" d="M51 0l33 170h166l-33 -170h-166z" /> -<glyph unicode="/" horiz-adv-x="804" d="M-53 -86l831 1606h140l-832 -1606h-139z" /> -<glyph unicode="0" horiz-adv-x="1290" d="M137 440q0 119 20.5 249t69.5 270.5t121 251t186.5 182t253.5 71.5q406 0 406 -467q0 -119 -19.5 -249t-68.5 -270t-121 -249.5t-186.5 -181.5t-255.5 -72q-406 0 -406 465zM285 440q0 -332 262 -331q106 0 194 62t143.5 158.5t93.5 218.5t53.5 234.5t15.5 212.5 q0 336 -263 336q-125 0 -226 -88t-157.5 -226t-86 -287t-29.5 -290z" /> -<glyph unicode="1" horiz-adv-x="954" d="M4 0l23 127h323l203 1042l18 80h-4q-20 -29 -90 -86l-178 -147l-78 100l393 324h134l-259 -1313h318l-25 -127h-778z" /> -<glyph unicode="2" horiz-adv-x="1161" d="M18 0q2 123 56.5 227.5t137.5 179t182.5 141t198.5 127t181 122t133 140.5t51 169q0 102 -66.5 162.5t-184.5 60.5q-59 0 -119 -20.5t-102 -48t-75.5 -56t-50.5 -49.5l-16 -20l-100 79q8 10 22.5 26.5t62.5 59.5t100 77t132 60.5t160 26.5q182 0 285.5 -95t103.5 -253 q0 -141 -86 -259t-213 -201t-256 -158.5t-232.5 -171t-125.5 -199.5h745l-24 -127h-900z" /> -<glyph unicode="3" horiz-adv-x="1159" d="M8 172l96 98q4 -6 13.5 -17t41 -39t69.5 -48.5t99.5 -37.5t129.5 -17q150 0 269.5 108.5t119.5 263.5q0 119 -87 182.5t-222 63.5h-107l-18 84l440 422l90 80v4q-41 -6 -117 -6h-530l24 127h842l-18 -94l-525 -498q47 -2 94.5 -13.5t99.5 -39t91 -66.5t64.5 -102.5 t25.5 -141.5q0 -205 -159.5 -357.5t-376.5 -152.5q-88 0 -166 20.5t-127 49.5t-86 57.5t-53 49.5z" /> -<glyph unicode="4" horiz-adv-x="1226" d="M33 399l18 93l879 948h166l-178 -916h204l-24 -125h-205l-78 -399h-141l78 399h-719zM240 524h536l117 602l33 136h-4l-13 -17q-12 -16 -34.5 -43.5t-43.5 -48.5z" /> -<glyph unicode="5" horiz-adv-x="1157" d="M31 180l102 92q4 -6 11.5 -17t34 -39t58 -49.5t87 -38.5t118.5 -17q164 0 295 118.5t131 286.5q0 119 -86 194.5t-223 75.5q-152 0 -276 -77l-88 32l213 699h700l-25 -127h-571l-115 -365l-28 -82h4q94 51 217 52q190 0 308 -112t118 -286q0 -225 -173 -385t-401 -160 q-252 0 -385 166z" /> -<glyph unicode="6" horiz-adv-x="1228" d="M127 494q0 106 31.5 233t97.5 258t157 237.5t222 174t278 67.5q78 0 146.5 -15t99.5 -30l31 -14l-72 -119q-84 45 -203 45q-211 0 -368.5 -171t-224.5 -406h4q66 78 168 123t208 45q178 0 283 -103.5t105 -275.5q0 -217 -147.5 -392.5t-379.5 -175.5q-203 0 -319.5 141.5 t-116.5 377.5zM274 467q0 -141 77 -249.5t210 -108.5q162 0 273.5 125.5t111.5 304.5q0 119 -71.5 187.5t-200.5 68.5q-137 0 -268.5 -95.5t-131.5 -232.5z" /> -<glyph unicode="7" horiz-adv-x="1071" d="M66 0l813 1180q25 35 50 67.5t40 48.5l14 17v4q-37 -4 -109 -4h-661l25 127h936l-19 -99l-930 -1341h-159z" /> -<glyph unicode="8" horiz-adv-x="1247" d="M90 356q0 94 44 180.5t109.5 145.5t105.5 88t69 43q-135 100 -135 244q0 160 136 283.5t353 123.5q188 0 292.5 -86t104.5 -235q0 -76 -33.5 -156t-86 -143.5t-84 -95t-60.5 -56.5q162 -104 162 -260q0 -190 -161 -323.5t-382 -133.5q-190 0 -312 102.5t-122 278.5z M240 360q0 -117 83 -185.5t203 -68.5q152 0 272 91.5t120 232.5q0 45 -22 83t-68 70.5t-84.5 54t-110.5 55.5t-107 52q-37 -20 -75.5 -47.5t-91 -77t-86 -118t-33.5 -142.5zM430 1057q0 -37 16.5 -71t37 -57.5t65.5 -51t72.5 -41t88 -42t85.5 -40.5q229 190 229 381 q0 92 -69.5 145t-186.5 53q-145 0 -241.5 -81.5t-96.5 -194.5z" /> -<glyph unicode="9" horiz-adv-x="1228" d="M82 35l72 119q86 -45 204 -45q143 0 268.5 88t203 214t120.5 275h-4q-61 -74 -163.5 -121t-211.5 -47q-180 0 -284.5 102.5t-104.5 276.5q0 217 148.5 392t380.5 175q203 0 318.5 -141t115.5 -377q0 -106 -32 -233t-97.5 -258t-156.5 -237.5t-222 -174.5t-279 -68 q-78 0 -146.5 14.5t-98.5 30.5zM326 901q0 -119 71.5 -187.5t196.5 -68.5q137 0 271 95.5t134 232.5q0 141 -77.5 249.5t-208.5 108.5q-162 0 -274.5 -126t-112.5 -304z" /> -<glyph unicode=":" horiz-adv-x="600" d="M98 0l33 170h166l-33 -170h-166zM266 860l33 170h166l-33 -170h-166z" /> -<glyph unicode=";" horiz-adv-x="608" d="M-41 -199l188 367h160l-223 -367h-125zM279 860l32 170h166l-33 -170h-165z" /> -<glyph unicode="<" horiz-adv-x="1206" d="M94 530v103l926 414v-138l-752 -325v-4l752 -326v-137z" /> -<glyph unicode="=" horiz-adv-x="1406" d="M215 344v119h954v-119h-954zM215 700v119h954v-119h-954z" /> -<glyph unicode=">" horiz-adv-x="1181" d="M150 117v137l751 326v4l-751 325v138l925 -414v-103z" /> -<glyph unicode="?" horiz-adv-x="976" d="M180 0l33 162h160l-33 -162h-160zM213 1358q16 12 47 30.5t120 48t173 29.5q162 0 260 -86t98 -225q0 -100 -45 -183t-112.5 -140.5t-137 -109.5t-127 -117.5t-71.5 -139.5l-19 -88h-137l19 92q18 94 75.5 173t124 132t131 105.5t107.5 118t43 143.5q0 84 -60.5 138 t-162.5 54q-66 0 -132.5 -21.5t-99.5 -43.5l-35 -23z" /> -<glyph unicode="@" horiz-adv-x="1624" d="M96 358q0 231 125 438.5t327 329t421 121.5q236 0 342 -89t106 -234q0 -27 -8 -80l-123 -629h146l-23 -115h-530q-162 0 -260.5 95.5t-98.5 240.5q0 174 142.5 312.5t330.5 138.5h285q4 25 4 39q0 88 -77 144t-230 56q-291 0 -513 -231t-222 -533q0 -217 136 -356 t363 -139l-22 -121q-268 0 -444.5 174t-176.5 438zM664 438q0 -96 63.5 -159.5t167.5 -63.5h254l108 563h-249q-135 0 -239.5 -103.5t-104.5 -236.5z" /> -<glyph unicode="A" d="M-88 0l803 1440h155l248 -1440h-143l-76 459h-580l-253 -459h-154zM383 582h496l-86 522l-23 186h-4q-53 -119 -90 -186z" /> -<glyph unicode="B" horiz-adv-x="1284" d="M90 0l281 1440h463q104 0 172 -27q182 -72 182 -276q0 -131 -68.5 -230.5t-181.5 -146.5v-4q82 -29 130 -103.5t48 -179.5q0 -152 -79 -265.5t-206 -168.5q-92 -39 -204 -39h-537zM256 127h369q86 0 149 29q88 41 141.5 125t53.5 192q0 102 -63.5 160.5t-172.5 58.5h-366 zM391 815h348q123 0 212 88t89 221q0 88 -53 138.5t-151 50.5h-349z" /> -<glyph unicode="C" horiz-adv-x="1488" d="M121 594q0 233 119.5 435t317.5 318.5t417 116.5q297 0 477 -155l31 -31l-90 -100q-6 6 -17.5 16t-50.5 36.5t-83 47t-115.5 37t-147.5 16.5q-287 0 -499 -218t-212 -515q0 -215 130 -352t347 -137q129 0 255 48t188 95l61 47l70 -111q-10 -8 -28.5 -22t-78 -51t-123 -66 t-158.5 -51.5t-190 -22.5q-285 0 -452.5 172.5t-167.5 446.5z" /> -<glyph unicode="D" horiz-adv-x="1511" d="M90 0l281 1440h436q293 0 459 -146.5t166 -412.5q0 -369 -241 -625t-611 -256h-490zM254 127h309q311 0 516 214t205 531q0 211 -130 326t-359 115h-308z" /> -<glyph unicode="E" horiz-adv-x="1163" d="M90 0l281 1440h811l-27 -127h-668l-102 -525h547l-25 -126h-545l-106 -535h705l-23 -127h-848z" /> -<glyph unicode="F" horiz-adv-x="1056" d="M90 0l281 1440h757l-24 -127h-617l-104 -541h528l-24 -127h-529l-127 -645h-141z" /> -<glyph unicode="G" horiz-adv-x="1550" d="M119 578q0 236 118.5 440.5t318.5 325t425 120.5q152 0 276.5 -42t176.5 -83l49 -41l-90 -102q-6 6 -17.5 15.5t-50.5 32t-83 41t-114.5 32.5t-144.5 14q-293 0 -505 -223t-212 -524q0 -213 129 -344t338 -131q80 0 161 22.5t139.5 56t104.5 66.5t70 55l23 23l47 229 h-246l25 127h379l-133 -688h-132l23 111l14 61h-4q-8 -8 -22.5 -21.5t-64.5 -47t-103 -59.5t-134 -47.5t-163 -21.5q-264 0 -431 168.5t-167 434.5z" /> -<glyph unicode="H" horiz-adv-x="1536" d="M90 0l281 1440h141l-127 -656h834l129 656h141l-281 -1440h-143l129 657h-834l-129 -657h-141z" /> -<glyph unicode="I" horiz-adv-x="559" d="M90 0l281 1440h141l-281 -1440h-141z" /> -<glyph unicode="J" horiz-adv-x="1060" d="M14 301q0 51 11 107l10 53h141l-8 -51q-10 -51 -10 -88q0 -213 213 -213q68 0 129 25.5t115.5 95t74.5 173.5l174 910h-350l25 127h491l-203 -1051q-41 -213 -170 -313.5t-288 -100.5q-152 0 -253.5 81t-101.5 245z" /> -<glyph unicode="K" horiz-adv-x="1228" d="M90 0l281 1440h141l-121 -625h234l518 625h168l-572 -686v-4l314 -750h-154l-283 688h-249l-136 -688h-141z" /> -<glyph unicode="L" horiz-adv-x="1044" d="M90 0l281 1440h141l-256 -1313h668l-27 -127h-807z" /> -<glyph unicode="M" horiz-adv-x="1746" d="M43 0l395 1440h144l211 -846l36 -176h5q57 100 104 176l543 846h149l-166 -1440h-139l119 1008q4 35 11 85t13.5 82.5t8.5 32.5h-4q-66 -127 -115 -200l-481 -740h-134l-196 740l-39 204h-4q-20 -127 -41 -204l-279 -1008h-141z" /> -<glyph unicode="N" horiz-adv-x="1529" d="M90 0l281 1440h127l532 -1037q37 -72 80 -194h4q10 119 25 194l202 1037h142l-281 -1440h-127l-532 1036l-82 195h-4q-10 -119 -25 -195l-201 -1036h-141z" /> -<glyph unicode="O" horiz-adv-x="1683" d="M119 598q0 227 124 429t323.5 319.5t416.5 117.5q279 0 453 -170t174 -436q0 -231 -125 -437t-326 -326t-416 -120q-279 0 -451.5 174.5t-172.5 448.5zM264 602q0 -217 134 -355t347 -138q272 0 494.5 222t222.5 521q0 211 -134 345t-347 134q-276 0 -496.5 -217 t-220.5 -512z" /> -<glyph unicode="P" horiz-adv-x="1228" d="M90 0l281 1440h471q141 0 227 -49q170 -92 170 -304q0 -164 -86 -292.5t-223 -188.5q-100 -41 -209 -41h-379l-111 -565h-141zM367 692h340q94 0 167 33q98 45 158 137t60 219q0 111 -70 171.5t-197 60.5h-338z" /> -<glyph unicode="Q" horiz-adv-x="1708" d="M119 598q0 227 124 429t324.5 319.5t417.5 117.5q279 0 452 -170t173 -436q0 -365 -285 -633l139 -174l-94 -84l-139 178q-225 -170 -486 -170q-279 0 -452.5 174.5t-173.5 448.5zM266 602q0 -217 134.5 -355t344.5 -138q215 0 402 141l-143 182l94 84l143 -186 q221 225 221 522q0 211 -133 345t-346 134q-276 0 -496.5 -217t-220.5 -512z" /> -<glyph unicode="R" horiz-adv-x="1282" d="M90 0l281 1440h473q125 0 200 -39q170 -82 170 -291q0 -170 -101 -301t-263 -168v-4q10 -18 24 -59l205 -578h-151l-211 606h-367l-117 -606h-143zM375 733h334q152 0 256 101.5t104 261.5q0 102 -64.5 159.5t-177.5 57.5h-340z" /> -<glyph unicode="S" horiz-adv-x="1101" d="M20 160l95 100q4 -6 14 -16.5t43 -36t71 -45t98 -35.5t126 -16q135 0 238.5 82.5t103.5 212.5q0 80 -61.5 140t-149.5 102t-175 88t-148.5 123t-61.5 181q0 170 147.5 297t354.5 127q117 0 212 -34.5t134 -69.5l37 -35l-84 -108q-12 12 -36 30.5t-100.5 50t-160.5 31.5 q-152 0 -255.5 -89t-103.5 -200q0 -72 61.5 -127t148.5 -97t175 -90t149.5 -129t61.5 -191q0 -174 -140 -302.5t-347 -128.5q-258 0 -420 156z" /> -<glyph unicode="T" horiz-adv-x="1191" d="M143 1313l23 127h1173l-22 -127h-518l-254 -1313h-144l256 1313h-514z" /> -<glyph unicode="U" horiz-adv-x="1476" d="M156 393q0 55 12 117l182 930h142l-183 -934q-10 -49 -10 -96q0 -143 90 -222t252 -79q186 0 317.5 107.5t167.5 293.5l183 930h143l-188 -948q-47 -240 -215 -378.5t-410 -138.5q-219 0 -351 111.5t-132 306.5z" /> -<glyph unicode="V" horiz-adv-x="1259" d="M178 1440h146l184 -1094q12 -74 18 -186h4l15 28q14 31 36.5 79t41.5 79l612 1094h160l-813 -1440h-154z" /> -<glyph unicode="W" horiz-adv-x="1908" d="M236 1440h145l63 -1118l2 -154h5q33 80 67 154l537 1118h141l72 -1118l4 -154h4q31 82 61 154l498 1118h156l-654 -1440h-172l-69 1014l-4 215h-5q-51 -121 -94 -213l-491 -1016h-168z" /> -<glyph unicode="X" horiz-adv-x="1198" d="M-66 0l605 758l-285 682h154l170 -422l63 -164h4q57 86 117 162l340 424h170l-561 -697l319 -743h-151l-207 492l-60 159h-4q-55 -82 -114 -155l-396 -496h-164z" /> -<glyph unicode="Y" horiz-adv-x="1155" d="M176 1440h152l202 -522l58 -173h4q59 94 119 170l405 525h172l-649 -826l-121 -614h-141l123 618z" /> -<glyph unicode="Z" horiz-adv-x="1210" d="M-35 0l21 100l942 1082q68 78 127 131v4q-33 -4 -105 -4h-690l27 127h979l-21 -101l-944 -1081q-68 -78 -127 -131v-4q35 4 105 4h737l-25 -127h-1026z" /> -<glyph unicode="[" horiz-adv-x="581" d="M59 -195l330 1690h277l-23 -115h-149l-281 -1460h147l-22 -115h-279z" /> -<glyph unicode="\" horiz-adv-x="790" d="M242 1520h125l206 -1606h-124z" /> -<glyph unicode="]" horiz-adv-x="569" d="M-82 -195l23 115h149l283 1460h-150l23 115h278l-327 -1690h-279z" /> -<glyph unicode="^" horiz-adv-x="1241" d="M31 512l405 928h96l406 -928h-133l-320 758l-319 -758h-135z" /> -<glyph unicode="_" horiz-adv-x="1187" d="M-76 -119l23 119h1057l-23 -119h-1057z" /> -<glyph unicode="`" horiz-adv-x="1032" d="M281 1784h151l96 -244h-118z" /> -<glyph unicode="a" horiz-adv-x="1067" d="M16 236q0 96 46.5 169.5t116 116.5t165.5 69.5t184 36t183 9.5h65q14 63 15 108q0 184 -211 185q-76 0 -154 -24.5t-119 -49.5l-39 -25l-45 117q16 12 48 29.5t128.5 47.5t192.5 30q160 0 250 -73t90 -220q0 -51 -12 -113l-127 -649h-134l25 119l23 88h-5q2 0 -13 -23.5 t-47 -58.5t-75 -68.5t-107.5 -57.5t-133.5 -24q-131 0 -220.5 70t-89.5 191zM160 254q0 -68 50 -114t148 -46q135 0 247 122t145 269l8 37h-60q-538 0 -538 -268z" /> -<glyph unicode="b" horiz-adv-x="1210" d="M51 0l279 1440h139l-96 -498l-27 -94h4q55 92 157.5 149.5t215.5 57.5q180 0 279.5 -110.5t99.5 -303.5q0 -287 -169 -476.5t-392 -189.5q-117 0 -204 55.5t-120 155.5h-4q0 -43 -10 -92l-19 -94h-133zM274 391q0 -127 64.5 -209t193.5 -82q162 0 294 147.5t132 383.5 q0 139 -69.5 218t-190.5 79q-182 0 -303 -164t-121 -373z" /> -<glyph unicode="c" horiz-adv-x="1124" d="M68 414q0 272 191.5 456.5t440.5 184.5q115 0 208 -37t128 -74l37 -37l-84 -94q-10 12 -31.5 31.5t-95.5 51.5t-155 32q-193 0 -344.5 -145.5t-151.5 -356.5q0 -145 93 -235.5t243 -90.5q188 0 346 133l14 13l43 -117q-6 -6 -18 -16.5t-54 -37t-86 -47t-113 -37 t-138 -16.5q-211 0 -342 121t-131 318z" /> -<glyph unicode="d" horiz-adv-x="1210" d="M70 389q0 287 169 476.5t396 189.5q113 0 199 -52.5t118 -152.5h4q0 43 9 86l98 504h139l-278 -1440h-136l21 109l22 81h-4q-55 -90 -154.5 -152.5t-219.5 -62.5q-184 0 -283.5 110.5t-99.5 303.5zM213 397q0 -139 69.5 -218t192.5 -79q182 0 302 167t120 370 q0 127 -64.5 209t-191.5 82q-162 0 -295 -147.5t-133 -383.5z" /> -<glyph unicode="e" horiz-adv-x="1132" d="M70 410q0 258 172 451.5t426 193.5q186 0 281 -102.5t95 -270.5q0 -35 -8 -79t-16 -71l-6 -24h-791q-8 -41 -8 -88q0 -139 86 -229.5t244 -90.5q82 0 166 32t127 63l43 30l45 -114q-18 -14 -52 -37t-135.5 -61t-197.5 -38q-211 0 -341 120t-130 315zM250 623h645 q6 35 6 71q0 119 -64.5 181.5t-168.5 62.5q-133 0 -249 -84t-169 -231z" /> -<glyph unicode="f" horiz-adv-x="661" d="M102 0l177 903h-129l22 119h129l10 53q23 117 75 198t118.5 115.5t119 48t103.5 13.5l76 -4l-27 -125q-18 4 -47 4t-56.5 -4t-63.5 -20.5t-65.5 -43t-56 -75.5t-38.5 -115l-11 -45h264l-22 -119h-262l-176 -903h-140z" /> -<glyph unicode="g" horiz-adv-x="1193" d="M10 -344l68 106q115 -68 270 -67q158 0 272.5 81t149.5 242l21 95l22 82h-4q-127 -188 -342 -189q-182 0 -286.5 111.5t-104.5 298.5q0 152 60.5 294t187.5 243.5t292 101.5q117 0 207 -43t121 -140h4q-2 23 2 46l23 112h135l-199 -1018q-45 -229 -197.5 -335.5 t-353.5 -106.5q-188 0 -348 86zM219 424q0 -137 70.5 -215t200 -78t223.5 90t135 211t41 246q0 250 -262 250q-186 0 -297 -152.5t-111 -351.5z" /> -<glyph unicode="h" horiz-adv-x="1216" d="M49 0l281 1440h139l-107 -557l-24 -92h4q49 94 173 179t278 85q141 0 216.5 -67.5t75.5 -199.5q0 -55 -16 -137l-125 -651h-139l119 616q16 94 16 138q0 84 -47 127t-129 43q-170 0 -308.5 -132.5t-174.5 -314.5l-93 -477h-139z" /> -<glyph unicode="i" horiz-adv-x="475" d="M49 0l201 1030h139l-201 -1030h-139zM289 1266l37 174h149l-35 -174h-151z" /> -<glyph unicode="j" horiz-adv-x="475" d="M-309 -416l24 121q16 -2 45 -2q37 0 73 9t80 34t80 82t52 139l205 1063h139l-207 -1067q-23 -121 -74 -204t-115.5 -118.5t-115.5 -49t-104 -13.5zM289 1266l35 174h149l-33 -174h-151z" /> -<glyph unicode="k" horiz-adv-x="1026" d="M49 0l283 1440h139l-158 -803h160l385 393h176l-448 -455v-4l280 -571h-153l-246 514h-176l-103 -514h-139z" /> -<glyph unicode="l" horiz-adv-x="505" d="M80 182q0 35 8 74l231 1184h140l-228 -1166q-6 -33 -6 -63q0 -41 16.5 -62.5t35 -25.5t45.5 -4l30 2l-26 -125q-23 -4 -47 -4q-78 0 -138.5 42t-60.5 148z" /> -<glyph unicode="m" horiz-adv-x="1875" d="M51 0l199 1030h137l-29 -151q-4 -20 -11 -43t-11 -37l-4 -13h4q59 113 178 191t248 78q137 0 200.5 -65.5t69.5 -192.5h4q61 111 178 184.5t244 73.5q141 0 214 -68.5t73 -200.5q0 -57 -16 -139l-125 -647h-140l119 608q16 78 16 142q0 178 -178 178 q-156 0 -275.5 -136.5t-152.5 -304.5l-96 -487h-139l119 608q16 78 16 146q0 174 -170 174q-154 0 -280 -135.5t-158 -307.5l-95 -485h-139z" /> -<glyph unicode="n" horiz-adv-x="1216" d="M49 0l201 1030h135l-27 -147l-26 -97h4q49 96 174 182.5t281 86.5q141 0 217.5 -67.5t76.5 -199.5q0 -55 -16 -137l-127 -651h-139l119 616q16 76 16 138q0 170 -176 170q-170 0 -307.5 -132.5t-173.5 -314.5l-93 -477h-139z" /> -<glyph unicode="o" horiz-adv-x="1275" d="M68 426q0 258 192.5 443.5t439.5 185.5q209 0 340 -125t131 -320q0 -260 -194.5 -447.5t-437.5 -187.5q-209 0 -340 126t-131 325zM211 430q0 -145 91 -237.5t239 -92.5q186 0 336.5 148.5t150.5 355.5q0 143 -92 233.5t-238 90.5q-188 0 -337.5 -146.5t-149.5 -351.5z " /> -<glyph unicode="p" horiz-adv-x="1210" d="M-29 -410l279 1440h133l-18 -100l-25 -88h4q59 92 156.5 152.5t220.5 60.5q180 0 280.5 -110.5t100.5 -303.5q0 -287 -168 -476.5t-389 -189.5q-117 0 -203 52.5t-121 154.5h-4q-2 -45 -12 -98l-96 -494h-138zM274 397q0 -129 66 -213t192 -84q162 0 294 147.5t132 383.5 q0 139 -68.5 218t-191.5 79q-180 0 -302 -165t-122 -366z" /> -<glyph unicode="q" horiz-adv-x="1210" d="M70 387q0 289 170 478.5t397 189.5q117 0 201 -53.5t116 -153.5h4q2 33 11 78l20 104h133l-278 -1440h-139l96 496l26 98h-4q-53 -88 -149 -148.5t-221 -60.5q-182 0 -282.5 111t-100.5 301zM213 397q0 -137 70.5 -217t191.5 -80q182 0 303 167t121 370q0 127 -64.5 209 t-191.5 82q-164 0 -297 -147.5t-133 -383.5z" /> -<glyph unicode="r" horiz-adv-x="729" d="M51 0l199 1030h137l-37 -182l-24 -90h4q57 121 156.5 201.5t220.5 80.5q37 0 61 -6l-27 -137q-29 4 -51 4q-154 0 -271.5 -163t-154.5 -353l-74 -385h-139z" /> -<glyph unicode="s" horiz-adv-x="905" d="M-6 125l84 92q12 -12 33.5 -31.5t97.5 -52.5t162 -33q94 0 168.5 50.5t74.5 138.5q0 51 -48 90t-116.5 67.5t-137 62.5t-117 93.5t-48.5 138.5q0 145 115 229.5t264 84.5q98 0 177 -28t110 -56l31 -29l-78 -98q-8 10 -25.5 24.5t-80 38t-136.5 23.5q-92 0 -165.5 -46 t-73.5 -139q0 -61 73.5 -109t160.5 -79t161 -99.5t74 -168.5q0 -135 -113 -224.5t-268 -89.5q-72 0 -137.5 15.5t-107.5 37t-73.5 44t-46.5 39.5z" /> -<glyph unicode="t" horiz-adv-x="681" d="M127 903l23 119h137l57 293h137l-59 -293h260l-23 -119h-258l-98 -510q-10 -57 -10 -92q0 -184 176 -184l59 4l-24 -125q-25 -4 -53 -4q-299 0 -299 291q0 41 10 112l100 508h-135z" /> -<glyph unicode="u" horiz-adv-x="1206" d="M94 242q0 55 17 137l125 651h139l-119 -612q-14 -74 -14 -142q0 -82 40 -126t140 -44q166 0 299 137.5t168 313.5l92 473h139l-200 -1030h-138l29 147l27 97h-4q-53 -98 -173 -183.5t-278 -85.5q-127 0 -208 65t-81 202z" /> -<glyph unicode="v" horiz-adv-x="978" d="M96 1030h140l135 -760l12 -125h4q33 72 64 125l430 760h151l-594 -1030h-147z" /> -<glyph unicode="w" horiz-adv-x="1642" d="M115 1030h139l100 -772l8 -111h5q29 59 55 111l399 768h140l104 -768l10 -111h4q25 57 51 111l402 772h149l-546 -1030h-152l-111 739l-10 111h-4q-27 -61 -53 -111l-391 -739h-152z" /> -<glyph unicode="x" horiz-adv-x="1001" d="M-63 0l471 543l-250 487h155l162 -342l25 -61h2q23 31 45 57l289 346h168l-435 -500l269 -530h-150l-186 383l-27 59h-4q-16 -27 -39 -55l-330 -387h-165z" /> -<glyph unicode="y" horiz-adv-x="1021" d="M-184 -369l69 105q43 -41 115 -41q125 0 229 166l93 149l-234 1020h145l160 -770l19 -108h2q29 57 57 106l447 772h157l-753 -1249q-125 -211 -318 -211q-114 0 -188 61z" /> -<glyph unicode="z" horiz-adv-x="1034" d="M-33 0l17 90l706 723l98 94v4q-33 -4 -98 -4h-524l24 123h820l-19 -92l-708 -721l-101 -94v-4q35 4 103 4h567l-23 -123h-862z" /> -<glyph unicode="{" horiz-adv-x="686" d="M102 598l25 127q8 0 20.5 3t45 18.5t59.5 38t54.5 69.5t39.5 107l35 174q72 360 375 360h30l-20 -115h-18q-25 0 -50.5 -7t-65.5 -28.5t-74 -79t-50 -141.5l-41 -206q-12 -59 -38 -107.5t-55.5 -74t-57 -43t-46.5 -23.5l-18 -6v-5q12 -6 32.5 -19t53.5 -66.5t33 -120.5 q0 -27 -6 -60l-43 -219q-10 -57 -11 -90q0 -72 32 -112t60.5 -47t59.5 -7h18l-22 -115q-12 -2 -33 -2q-31 0 -64.5 9.5t-77.5 33t-73 80t-29 137.5q0 49 13 115l36 189q6 33 7 61q0 70 -34 113t-69 51z" /> -<glyph unicode="|" horiz-adv-x="630" d="M256 -322v1936h129v-1936h-129z" /> -<glyph unicode="}" horiz-adv-x="679" d="M-90 -197l22 115h19q27 0 52.5 7t64 28.5t71.5 78t49 142.5l45 229q18 98 72.5 163t100.5 81l43 17v4q-12 6 -33 19t-53.5 64.5t-32.5 116.5q0 25 6 60l39 196q10 57 10 90q0 72 -31.5 112t-60.5 47t-60 7h-18l23 115q14 2 32 2q31 0 65 -9t78 -32.5t72.5 -80 t28.5 -138.5q0 -49 -12 -115l-33 -164q-6 -37 -6 -63q0 -70 33.5 -113t68.5 -51l33 -8l-25 -127q-6 0 -18 -3t-45 -17.5t-60.5 -38t-55 -69.5t-40.5 -108l-39 -196q-72 -362 -374 -363z" /> -<glyph unicode="~" horiz-adv-x="1206" d="M131 428q0 162 69.5 239.5t190.5 77.5q61 0 110.5 -21.5t81 -53t61.5 -63.5t69 -53.5t86 -21.5q82 0 113.5 63.5t31.5 141.5h121q0 -162 -69.5 -239.5t-190.5 -77.5q-76 0 -134.5 33.5t-89 72.5t-78.5 73t-106 34q-82 0 -113.5 -63.5t-31.5 -141.5h-121z" /> -<glyph unicode="¡" horiz-adv-x="557" d="M8 -410l215 1063h131l-202 -1063h-144zM248 868l33 162h161l-34 -162h-160z" /> -<glyph unicode="¢" horiz-adv-x="1173" d="M129 586q0 258 156.5 473t398.5 233l35 172h115l-33 -176q213 -33 299 -231l22 -68l-131 -49q-2 8 -6 23.5t-22.5 53.5t-45 67.5t-78 53t-116.5 23.5q-199 0 -324 -171t-125 -408q0 -139 70 -220t209 -81q186 0 324 180l26 39l127 -54q-6 -12 -18.5 -31.5t-55.5 -68.5 t-92 -89t-127 -73.5t-159 -40.5l-33 -170h-115l33 177q-154 25 -244 139.5t-90 296.5z" /> -<glyph unicode="£" horiz-adv-x="1187" d="M2 0l25 127h127l104 541h-90l22 112h89l63 318q31 156 164 261t309 105q184 0 305 -112l10 -11l-98 -92q-8 8 -25.5 22.5t-75 37t-118.5 22.5q-131 0 -220 -72.5t-110 -181.5l-59 -297h393l-22 -112h-392l-106 -541h694l-24 -127h-965z" /> -<glyph unicode="¥" horiz-adv-x="1224" d="M170 432l18 105h334l19 79l-39 101h-277l21 104h217l-238 619h154l192 -512q31 -80 60 -183h4q55 100 119 183l393 512h170l-479 -619h215l-21 -104h-274l-74 -101l-18 -79h329l-18 -105h-330l-86 -432h-143l86 432h-334z" /> -<glyph unicode="§" horiz-adv-x="849" d="M-8 -37l84 88q57 -55 155 -55q123 0 196 80t77 200l39 887h123l-39 -897q-6 -164 -113.5 -278.5t-282.5 -114.5q-68 0 -128 22.5t-87 45.5zM201 174l37 897q6 164 113.5 278.5t283.5 114.5q68 0 128 -22.5t85 -44.5l26 -23l-83 -88q-59 55 -158 55q-121 0 -194.5 -79.5 t-78.5 -202.5l-36 -885h-123z" /> -<glyph unicode="¨" horiz-adv-x="1032" d="M176 1608l35 176h125l-33 -176h-127zM485 1608l35 176h127l-35 -176h-127z" /> -<glyph unicode="©" horiz-adv-x="1722" d="M152 721q0 309 211.5 526t510.5 217q305 0 519.5 -217t214.5 -526q0 -313 -213 -529.5t-521 -216.5q-301 0 -511.5 217.5t-210.5 528.5zM272 721q0 -268 174.5 -451.5t427.5 -183.5q260 0 437.5 183.5t177.5 451.5q0 266 -177 449.5t-438 183.5q-254 0 -428 -183.5 t-174 -449.5zM473 717q0 172 114.5 297t307.5 125q63 0 120.5 -19.5t94.5 -47.5t65.5 -56.5t41.5 -48.5l12 -19l-94 -63l-11 15q-6 9 -28.5 33.5t-48 43t-65.5 34t-83 15.5q-141 0 -223 -90t-82 -217t81 -217t224 -90q135 0 225 127l11 14l94 -64q-4 -8 -13.5 -20t-40 -45 t-66.5 -58.5t-93.5 -46t-120.5 -20.5q-195 0 -308.5 124t-113.5 294z" /> -<glyph unicode="ª" horiz-adv-x="870" d="M150 541l18 96h539l-19 -96h-538zM233 952q0 57 24 102.5t64.5 71t85 43t98.5 24.5t87 9t70 2h36q8 35 9 53q0 106 -119 107q-41 0 -88 -14.5t-74 -28.5l-25 -14l-39 84q102 70 242 69q215 0 215 -190q0 -33 -12 -90l-76 -385h-108l20 100h-4q-4 -4 -9 -12.5t-26.5 -27.5 t-44 -33.5t-59.5 -27t-74 -12.5q-74 0 -133.5 44t-59.5 126zM352 965q0 -37 28 -60.5t79 -23.5q76 0 141.5 73.5t77.5 141.5l4 18h-27q-303 1 -303 -149z" /> -<glyph unicode="«" horiz-adv-x="1062" d="M90 582l393 417h160l-407 -428l258 -413h-140zM451 582l421 417h162l-440 -428l260 -413h-141z" /> -<glyph unicode="¬" horiz-adv-x="1306" d="M166 700v119h954v-495h-125v376h-829z" /> -<glyph unicode="­" horiz-adv-x="884" d="M20 518l23 127h582l-25 -127h-580z" /> -<glyph unicode="®" horiz-adv-x="1722" d="M152 721q0 309 211.5 526t510.5 217q305 0 519.5 -217t214.5 -526q0 -313 -213 -529.5t-521 -216.5q-301 0 -511.5 217.5t-210.5 528.5zM272 721q0 -268 174.5 -451.5t427.5 -183.5q260 0 437.5 183.5t177.5 451.5q0 266 -177 449.5t-438 183.5q-254 0 -428 -183.5 t-174 -449.5zM633 1120h285q106 0 172.5 -65.5t66.5 -171.5q0 -84 -44 -140.5t-105 -70.5v-4q8 -10 26 -45l154 -301h-127l-160 323h-153v-323h-115v798zM748 735h149q66 0 103.5 39t37.5 109q0 68 -37.5 104.5t-103.5 36.5h-149v-289z" /> -<glyph unicode="¯" horiz-adv-x="1032" d="M147 1608l21 112h506l-21 -112h-506z" /> -<glyph unicode="°" horiz-adv-x="778" d="M205 1141q0 125 101.5 223t228.5 98q111 0 182 -70.5t71 -177.5q0 -125 -102 -223t-227 -98q-113 0 -183.5 69.5t-70.5 178.5zM326 1145q0 -59 38.5 -98t102.5 -39q78 0 139.5 61t61.5 141q0 59 -39 98.5t-101 39.5q-78 0 -140 -61.5t-62 -141.5z" /> -<glyph unicode="±" horiz-adv-x="1437" d="M158 522v119h473v522h125v-522h471v-119h-471v-522h-125v522h-473zM195 -213h995v-119h-995v119z" /> -<glyph unicode="²" horiz-adv-x="782" d="M0 866q2 113 62.5 200t143.5 141.5t166 101.5t140 106.5t57 130.5q0 55 -38.5 91t-102.5 36q-49 0 -99 -25.5t-77 -50.5l-27 -24l-65 78q12 14 36.5 35.5t96.5 56.5t141 35q117 0 184.5 -61.5t67.5 -162.5q0 -90 -49 -160.5t-124 -117.5t-150.5 -89t-139 -97.5 t-82.5 -120.5h449l-21 -103h-569z" /> -<glyph unicode="³" horiz-adv-x="782" d="M16 981l78 72q8 -10 24.5 -27.5t74 -45.5t120.5 -28q86 0 152.5 61.5t66.5 151.5q0 66 -51 104t-121 38h-67l-19 63l248 236l62 51v4q-39 -6 -76 -6h-311l18 102h539l-15 -74l-299 -284q78 -10 143.5 -66.5t65.5 -163.5q0 -127 -98 -225t-240 -98q-170 0 -284 123z" /> -<glyph unicode="´" horiz-adv-x="1032" d="M223 1540l191 244h172l-228 -244h-135z" /> -<glyph unicode="µ" horiz-adv-x="1245" d="M-16 -410l278 1440h139l-118 -612q-16 -86 -17 -142q0 -170 183 -170q166 0 299 137.5t167 313.5l91 473h139l-199 -1030h-137l29 147l26 97h-4q-55 -98 -174 -183.5t-276 -85.5q-150 0 -213 88h-4q-8 -106 -19 -157l-63 -316h-127z" /> -<glyph unicode="μ" horiz-adv-x="1245" d="M-16 -410l278 1440h139l-118 -612q-16 -86 -17 -142q0 -170 183 -170q166 0 299 137.5t167 313.5l91 473h139l-199 -1030h-137l29 147l26 97h-4q-55 -98 -174 -183.5t-276 -85.5q-150 0 -213 88h-4q-8 -106 -19 -157l-63 -316h-127z" /> -<glyph unicode="¶" horiz-adv-x="1173" d="M160 903q0 215 174 376t389 161h512l-23 -127h-370l-275 -1415h-118l114 596q-162 0 -282.5 117.5t-120.5 291.5zM694 -102l250 1292h117l-250 -1292h-117z" /> -<glyph unicode="·" horiz-adv-x="559" d="M174 504l33 170h164l-31 -170h-166z" /> -<glyph unicode="¸" horiz-adv-x="1032" d="M201 -408l20 95q35 -10 82 -11q119 0 119 80q0 59 -105 60l-30 -2l98 227l78 -14l-2 -17l-47 -123q49 -8 83.5 -42.5t34.5 -90.5q0 -86 -67.5 -130t-153.5 -44z" /> -<glyph unicode="¹" horiz-adv-x="782" d="M53 866l21 103h192l113 583l14 50h-4q-10 -16 -49 -50l-96 -77l-60 81l244 201h107l-154 -788h188l-18 -103h-498z" /> -<glyph unicode="º" horiz-adv-x="966" d="M160 541l18 96h621l-19 -96h-620zM233 1067q0 160 122 277.5t274 117.5q131 0 214 -79.5t83 -200.5q0 -164 -122 -281t-276 -117q-131 0 -213 79t-82 204zM346 1075q0 -84 51.5 -135t134.5 -51q109 0 195 84t86 203q0 82 -52 133t-136 51q-109 0 -194 -84t-85 -201z" /> -<glyph unicode="»" horiz-adv-x="1062" d="M16 158l439 428l-260 413h141l264 -424l-422 -417h-162zM406 158l409 428l-260 413h141l265 -424l-394 -417h-161z" /> -<glyph unicode="¼" horiz-adv-x="1933" d="M113 549l20 102h193l112 584l15 49h-4q-10 -16 -50 -49l-96 -78l-59 82l243 201h107l-154 -789h189l-19 -102h-497zM406 0l966 1440h127l-964 -1440h-129zM1069 233l14 78l545 580h119l-109 -555h134l-19 -103h-133l-47 -233h-113l45 233h-436zM1235 336h291l53 278 q4 25 13.5 56.5t13.5 50.5l6 20h-4q-43 -55 -86 -100l-287 -301v-4z" /> -<glyph unicode="½" horiz-adv-x="1906" d="M113 549l20 102h193l112 584l15 49h-4q-10 -16 -50 -49l-96 -78l-59 82l243 201h107l-154 -789h189l-19 -102h-497zM408 0l966 1440h127l-964 -1440h-129zM1090 0q2 113 62 200t143 141t166 101t140.5 106.5t57.5 131.5q0 55 -39 91t-102 36q-49 0 -99.5 -24.5 t-77.5 -49.5l-26 -26l-66 77q12 14 37 36t96.5 56.5t141.5 34.5q117 0 184.5 -61.5t67.5 -161.5q0 -90 -49.5 -160.5t-124 -118t-150.5 -89t-139.5 -97t-81.5 -121.5h448l-20 -102h-569z" /> -<glyph unicode="¾" horiz-adv-x="1959" d="M98 664l78 71q8 -10 24.5 -27.5t74 -45t120.5 -27.5q86 0 152.5 61.5t66.5 151.5q0 66 -51 103.5t-121 37.5h-67l-19 64l248 235l62 51v4q-39 -6 -76 -6h-311l18 103h539l-15 -74l-299 -285q78 -10 143.5 -66.5t65.5 -162.5q0 -127 -98 -225.5t-240 -98.5 q-170 0 -284 123zM432 0l967 1440h127l-965 -1440h-129zM1096 233l14 78l545 580h119l-109 -555h133l-18 -103h-133l-48 -233h-112l45 233h-436zM1262 336h290l54 278q4 25 13 56.5t15 50.5l4 20h-4q-43 -55 -86 -100l-286 -301v-4z" /> -<glyph unicode="¿" horiz-adv-x="899" d="M-43 -119q0 100 45 183t112.5 140.5t137.5 110t126 118t73 138.5l18 82h137l-18 -88q-20 -94 -77.5 -172t-124.5 -131t-130 -105.5t-106.5 -118t-43.5 -142.5q0 -84 60.5 -138.5t163.5 -54.5q66 0 132 21.5t99 42.5l35 22l59 -113q-16 -12 -46.5 -29.5t-120 -47 t-173.5 -29.5q-162 0 -260 85t-98 226zM496 868l32 162h160l-33 -162h-159z" /> -<glyph unicode="À" d="M-88 0l803 1440h155l248 -1440h-143l-76 459h-580l-253 -459h-154zM383 582h496l-86 522l-23 186h-4q-53 -119 -90 -186zM623 1784h151l96 -244h-118z" /> -<glyph unicode="Á" d="M-88 0l803 1440h155l248 -1440h-143l-76 459h-580l-253 -459h-154zM383 582h496l-86 522l-23 186h-4q-53 -119 -90 -186zM741 1540l191 244h172l-227 -244h-136z" /> -<glyph unicode="Â" d="M-88 0l803 1440h155l248 -1440h-143l-76 459h-580l-253 -459h-154zM383 582h496l-86 522l-23 186h-4q-53 -119 -90 -186zM559 1540l219 244h154l123 -244h-129l-78 166h-4l-144 -166h-141z" /> -<glyph unicode="Ã" d="M-88 0l803 1440h155l248 -1440h-143l-76 459h-580l-253 -459h-154zM383 582h496l-86 522l-23 186h-4q-53 -119 -90 -186zM510 1546q45 240 217 240q45 0 79 -22.5t51 -51.5t42 -51.5t53 -22.5q78 0 105 142h110q-47 -240 -219 -240q-55 0 -93 37t-67.5 73t-64.5 36 q-41 0 -66.5 -43.5t-35.5 -96.5h-111z" /> -<glyph unicode="Ä" d="M-88 0l803 1440h155l248 -1440h-143l-76 459h-580l-253 -459h-154zM383 582h496l-86 522l-23 186h-4q-53 -119 -90 -186zM610 1608l35 176h125l-33 -176h-127zM920 1608l34 176h127l-34 -176h-127z" /> -<glyph unicode="Å" d="M-88 0l803 1440h155l248 -1440h-143l-76 459h-580l-253 -459h-154zM383 582h496l-86 522l-23 186h-4q-53 -119 -90 -186zM680 1645q0 68 52 115.5t120 47.5q66 0 103.5 -33.5t37.5 -95.5q0 -66 -53 -113.5t-118.5 -47.5t-103.5 34t-38 93zM768 1647q0 -51 55 -52 q35 0 58.5 25t23.5 59q0 23 -15.5 38.5t-39.5 15.5q-33 0 -57.5 -24.5t-24.5 -61.5z" /> -<glyph unicode="Æ" horiz-adv-x="1755" d="M-92 0l870 1440h996l-25 -127h-670l-102 -525h547l-25 -126h-547l-104 -535h706l-24 -127h-848l129 664h-346l-397 -664h-160zM539 786h295l104 527h-82z" /> -<glyph unicode="Ç" horiz-adv-x="1492" d="M125 594q0 233 120 435t317.5 318.5t416.5 116.5q297 0 477 -155l31 -31l-90 -100q-6 6 -17.5 16t-50.5 36.5t-83 47t-115.5 37t-147.5 16.5q-287 0 -499 -218t-212 -515q0 -215 130 -352t348 -137q129 0 254.5 48t187.5 95l61 47l70 -111q-10 -8 -28.5 -22t-78 -51 t-123 -66t-158.5 -51.5t-190 -22.5h-4l-32 -88q49 -8 83.5 -42.5t34.5 -90.5q0 -86 -67.5 -130t-153.5 -44l-110 12l20 95q35 -10 82 -11q119 0 119 80q0 59 -105 60l-30 -2l71 168q-246 27 -387 194.5t-141 417.5z" /> -<glyph unicode="È" horiz-adv-x="1163" d="M90 0l281 1440h811l-27 -127h-668l-102 -525h547l-25 -126h-545l-106 -535h705l-23 -127h-848zM627 1784h151l96 -244h-118z" /> -<glyph unicode="É" horiz-adv-x="1163" d="M90 0l281 1440h811l-27 -127h-668l-102 -525h547l-25 -126h-545l-106 -535h705l-23 -127h-848zM748 1540l190 244h172l-227 -244h-135z" /> -<glyph unicode="Ê" horiz-adv-x="1163" d="M90 0l281 1440h811l-27 -127h-668l-102 -525h547l-25 -126h-545l-106 -535h705l-23 -127h-848zM565 1540l219 244h154l123 -244h-129l-78 166h-4l-143 -166h-142z" /> -<glyph unicode="Ë" horiz-adv-x="1163" d="M90 0l281 1440h811l-27 -127h-668l-102 -525h547l-25 -126h-545l-106 -535h705l-23 -127h-848zM616 1608l35 176h125l-33 -176h-127zM926 1608l35 176h126l-34 -176h-127z" /> -<glyph unicode="Ì" horiz-adv-x="559" d="M90 0l281 1440h141l-281 -1440h-141zM272 1784h152l96 -244h-119z" /> -<glyph unicode="Í" horiz-adv-x="559" d="M90 0l281 1440h141l-281 -1440h-141zM389 1540l191 244h172l-228 -244h-135z" /> -<glyph unicode="Î" horiz-adv-x="559" d="M90 0l281 1440h141l-281 -1440h-141zM209 1540l219 244h154l123 -244h-130l-77 166h-4l-144 -166h-141z" /> -<glyph unicode="Ï" horiz-adv-x="559" d="M90 0l281 1440h141l-281 -1440h-141zM260 1608l35 176h125l-33 -176h-127zM569 1608l35 176h127l-35 -176h-127z" /> -<glyph unicode="Ð" horiz-adv-x="1540" d="M117 0l129 662h-121l25 122h120l129 656h437q293 0 458.5 -146.5t165.5 -412.5q0 -369 -240.5 -625t-613.5 -256h-489zM283 127h309q311 0 516 214t205 531q0 211 -130 326t-360 115h-307l-104 -529h344l-25 -122h-344z" /> -<glyph unicode="Ñ" horiz-adv-x="1529" d="M90 0l281 1440h127l532 -1037q37 -72 80 -194h4q10 119 25 194l202 1037h142l-281 -1440h-127l-532 1036l-82 195h-4q-10 -119 -25 -195l-201 -1036h-141zM641 1546q45 240 217 240q45 0 79 -22.5t51.5 -51.5t42 -51.5t52.5 -22.5q78 0 105 142h110q-47 -240 -219 -240 q-55 0 -93 37t-67.5 73t-64.5 36q-41 0 -66.5 -43.5t-35.5 -96.5h-111z" /> -<glyph unicode="Ò" horiz-adv-x="1683" d="M119 598q0 227 124 429t323.5 319.5t416.5 117.5q279 0 453 -170t174 -436q0 -231 -125 -437t-326 -326t-416 -120q-279 0 -451.5 174.5t-172.5 448.5zM264 602q0 -217 134 -355t347 -138q272 0 494.5 222t222.5 521q0 211 -134 345t-347 134q-276 0 -496.5 -217 t-220.5 -512zM827 1784h152l96 -244h-119z" /> -<glyph unicode="Ó" horiz-adv-x="1683" d="M119 598q0 227 124 429t323.5 319.5t416.5 117.5q279 0 453 -170t174 -436q0 -231 -125 -437t-326 -326t-416 -120q-279 0 -451.5 174.5t-172.5 448.5zM264 602q0 -217 134 -355t347 -138q272 0 494.5 222t222.5 521q0 211 -134 345t-347 134q-276 0 -496.5 -217 t-220.5 -512zM946 1540l191 244h172l-228 -244h-135z" /> -<glyph unicode="Ô" horiz-adv-x="1683" d="M119 598q0 227 124 429t323.5 319.5t416.5 117.5q279 0 453 -170t174 -436q0 -231 -125 -437t-326 -326t-416 -120q-279 0 -451.5 174.5t-172.5 448.5zM264 602q0 -217 134 -355t347 -138q272 0 494.5 222t222.5 521q0 211 -134 345t-347 134q-276 0 -496.5 -217 t-220.5 -512zM764 1540l219 244h154l123 -244h-130l-77 166h-4l-144 -166h-141z" /> -<glyph unicode="Õ" horiz-adv-x="1683" d="M119 598q0 227 124 429t323.5 319.5t416.5 117.5q279 0 453 -170t174 -436q0 -231 -125 -437t-326 -326t-416 -120q-279 0 -451.5 174.5t-172.5 448.5zM264 602q0 -217 134 -355t347 -138q272 0 494.5 222t222.5 521q0 211 -134 345t-347 134q-276 0 -496.5 -217 t-220.5 -512zM715 1546q45 240 217 240q45 0 78.5 -22.5t51 -51.5t42 -51.5t53.5 -22.5q78 0 105 142h110q-47 -240 -219 -240q-55 0 -93 37t-67.5 73t-64.5 36q-41 0 -66.5 -43.5t-36.5 -96.5h-110z" /> -<glyph unicode="Ö" horiz-adv-x="1683" d="M119 598q0 227 124 429t323.5 319.5t416.5 117.5q279 0 453 -170t174 -436q0 -231 -125 -437t-326 -326t-416 -120q-279 0 -451.5 174.5t-172.5 448.5zM264 602q0 -217 134 -355t347 -138q272 0 494.5 222t222.5 521q0 211 -134 345t-347 134q-276 0 -496.5 -217 t-220.5 -512zM815 1608l35 176h125l-33 -176h-127zM1124 1608l35 176h127l-35 -176h-127z" /> -<glyph unicode="×" horiz-adv-x="1421" d="M184 84l443 498l-443 497l84 84l439 -493l438 493l84 -84l-445 -497l445 -498l-84 -84l-438 494l-439 -494z" /> -<glyph unicode="Ø" horiz-adv-x="1689" d="M121 598q0 227 124 429t324.5 319.5t417.5 117.5q223 0 383 -114l129 141l78 -66l-129 -141q164 -168 164 -426q0 -231 -125 -437t-324.5 -326t-414.5 -120q-227 0 -392 119l-131 -143l-80 63l136 148q-160 172 -160 436zM268 602q0 -197 113 -332l893 975 q-121 86 -289 86q-276 0 -496.5 -217t-220.5 -512zM453 201q125 -92 295 -92q274 0 495 222t221 521q0 190 -114 326z" /> -<glyph unicode="Ù" horiz-adv-x="1476" d="M156 393q0 55 12 117l182 930h142l-183 -934q-10 -49 -10 -96q0 -143 90 -222t252 -79q186 0 317.5 107.5t167.5 293.5l183 930h143l-188 -948q-47 -240 -215 -378.5t-410 -138.5q-219 0 -351 111.5t-132 306.5zM727 1784h152l96 -244h-119z" /> -<glyph unicode="Ú" horiz-adv-x="1476" d="M156 393q0 55 12 117l182 930h142l-183 -934q-10 -49 -10 -96q0 -143 90 -222t252 -79q186 0 317.5 107.5t167.5 293.5l183 930h143l-188 -948q-47 -240 -215 -378.5t-410 -138.5q-219 0 -351 111.5t-132 306.5zM846 1540l190 244h172l-227 -244h-135z" /> -<glyph unicode="Û" horiz-adv-x="1476" d="M156 393q0 55 12 117l182 930h142l-183 -934q-10 -49 -10 -96q0 -143 90 -222t252 -79q186 0 317.5 107.5t167.5 293.5l183 930h143l-188 -948q-47 -240 -215 -378.5t-410 -138.5q-219 0 -351 111.5t-132 306.5zM664 1540l219 244h153l123 -244h-129l-78 166h-4 l-143 -166h-141z" /> -<glyph unicode="Ü" horiz-adv-x="1476" d="M156 393q0 55 12 117l182 930h142l-183 -934q-10 -49 -10 -96q0 -143 90 -222t252 -79q186 0 317.5 107.5t167.5 293.5l183 930h143l-188 -948q-47 -240 -215 -378.5t-410 -138.5q-219 0 -351 111.5t-132 306.5zM715 1608l35 176h124l-32 -176h-127zM1024 1608l35 176 h127l-35 -176h-127z" /> -<glyph unicode="Ý" horiz-adv-x="1155" d="M176 1440h152l202 -522l58 -173h4q59 94 119 170l405 525h172l-649 -826l-121 -614h-141l123 618zM676 1540l190 244h172l-227 -244h-135z" /> -<glyph unicode="Þ" horiz-adv-x="1230" d="M90 0l283 1440h141l-51 -256h332q141 0 227 -49q168 -90 168 -304q0 -164 -86 -292.5t-221 -188.5q-94 -41 -211 -41h-377l-62 -309h-143zM317 436h340q94 0 168 33q98 43 157.5 135t59.5 221q0 109 -69.5 170.5t-194.5 61.5h-340z" /> -<glyph unicode="ß" horiz-adv-x="1175" d="M51 0l213 1104q33 166 167 263t290 97q154 0 243 -75.5t89 -192.5q0 -68 -33 -126t-78 -98t-91 -76t-79 -75t-33 -80q0 -43 49.5 -92t107.5 -90t107.5 -108.5t49.5 -141.5q0 -133 -111 -228t-258 -95q-88 0 -167 16t-114 33l-34 16l26 129q111 -70 281 -69q88 0 160.5 51 t72.5 145q0 57 -49 113.5t-108.5 95.5t-108.5 97.5t-49 119.5q0 70 49 133.5t107.5 104.5t107.5 98t49 117q0 61 -49 106t-139 45q-109 0 -202 -69.5t-116 -190.5l-211 -1077h-139z" /> -<glyph unicode="à" horiz-adv-x="1067" d="M16 236q0 96 46.5 169.5t116 116.5t165.5 69.5t184 36t183 9.5h65q14 63 15 108q0 184 -211 185q-76 0 -154 -24.5t-119 -49.5l-39 -25l-45 117q16 12 48 29.5t128.5 47.5t192.5 30q160 0 250 -73t90 -220q0 -51 -12 -113l-127 -649h-134l25 119l23 88h-5q2 0 -13 -23.5 t-47 -58.5t-75 -68.5t-107.5 -57.5t-133.5 -24q-131 0 -220.5 70t-89.5 191zM160 254q0 -68 50 -114t148 -46q135 0 247 122t145 269l8 37h-60q-538 0 -538 -268zM449 1440h151l96 -244h-118z" /> -<glyph unicode="á" horiz-adv-x="1067" d="M16 236q0 96 46.5 169.5t116 116.5t165.5 69.5t184 36t183 9.5h65q14 63 15 108q0 184 -211 185q-76 0 -154 -24.5t-119 -49.5l-39 -25l-45 117q16 12 48 29.5t128.5 47.5t192.5 30q160 0 250 -73t90 -220q0 -51 -12 -113l-127 -649h-134l25 119l23 88h-5q2 0 -13 -23.5 t-47 -58.5t-75 -68.5t-107.5 -57.5t-133.5 -24q-131 0 -220.5 70t-89.5 191zM160 254q0 -68 50 -114t148 -46q135 0 247 122t145 269l8 37h-60q-538 0 -538 -268zM569 1196l191 244h172l-227 -244h-136z" /> -<glyph unicode="â" horiz-adv-x="1067" d="M16 236q0 96 46.5 169.5t116 116.5t165.5 69.5t184 36t183 9.5h65q14 63 15 108q0 184 -211 185q-76 0 -154 -24.5t-119 -49.5l-39 -25l-45 117q16 12 48 29.5t128.5 47.5t192.5 30q160 0 250 -73t90 -220q0 -51 -12 -113l-127 -649h-134l25 119l23 88h-5q2 0 -13 -23.5 t-47 -58.5t-75 -68.5t-107.5 -57.5t-133.5 -24q-131 0 -220.5 70t-89.5 191zM160 254q0 -68 50 -114t148 -46q135 0 247 122t145 269l8 37h-60q-538 0 -538 -268zM385 1196l219 244h154l123 -244h-129l-78 166h-4l-144 -166h-141z" /> -<glyph unicode="ã" horiz-adv-x="1067" d="M16 236q0 96 46.5 169.5t116 116.5t165.5 69.5t184 36t183 9.5h65q14 63 15 108q0 184 -211 185q-76 0 -154 -24.5t-119 -49.5l-39 -25l-45 117q16 12 48 29.5t128.5 47.5t192.5 30q160 0 250 -73t90 -220q0 -51 -12 -113l-127 -649h-134l25 119l23 88h-5q2 0 -13 -23.5 t-47 -58.5t-75 -68.5t-107.5 -57.5t-133.5 -24q-131 0 -220.5 70t-89.5 191zM160 254q0 -68 50 -114t148 -46q135 0 247 122t145 269l8 37h-60q-538 0 -538 -268zM336 1202q45 240 217 240q45 0 79 -22.5t51 -51.5t42 -51.5t53 -22.5q78 0 105 142h110q-47 -240 -219 -240 q-55 0 -93 37t-67.5 72.5t-64.5 35.5q-41 0 -66.5 -43t-36.5 -96h-110z" /> -<glyph unicode="ä" horiz-adv-x="1067" d="M16 236q0 96 46.5 169.5t116 116.5t165.5 69.5t184 36t183 9.5h65q14 63 15 108q0 184 -211 185q-76 0 -154 -24.5t-119 -49.5l-39 -25l-45 117q16 12 48 29.5t128.5 47.5t192.5 30q160 0 250 -73t90 -220q0 -51 -12 -113l-127 -649h-134l25 119l23 88h-5q2 0 -13 -23.5 t-47 -58.5t-75 -68.5t-107.5 -57.5t-133.5 -24q-131 0 -220.5 70t-89.5 191zM160 254q0 -68 50 -114t148 -46q135 0 247 122t145 269l8 37h-60q-538 0 -538 -268zM436 1264l35 176h125l-33 -176h-127zM745 1264l35 176h127l-35 -176h-127z" /> -<glyph unicode="å" horiz-adv-x="1067" d="M16 236q0 96 46.5 169.5t116 116.5t165.5 69.5t184 36t183 9.5h65q14 63 15 108q0 184 -211 185q-76 0 -154 -24.5t-119 -49.5l-39 -25l-45 117q16 12 48 29.5t128.5 47.5t192.5 30q160 0 250 -73t90 -220q0 -51 -12 -113l-127 -649h-134l25 119l23 88h-5q2 0 -13 -23.5 t-47 -58.5t-75 -68.5t-107.5 -57.5t-133.5 -24q-131 0 -220.5 70t-89.5 191zM160 254q0 -68 50 -114t148 -46q135 0 247 122t145 269l8 37h-60q-538 0 -538 -268zM506 1300q0 68 52 116t120 48q66 0 103.5 -33.5t37.5 -95.5q0 -66 -53 -114t-118.5 -47.5t-103.5 34t-38 92.5 zM594 1303q0 -51 55 -52q35 0 58.5 24.5t23.5 59.5q0 23 -15.5 38.5t-39.5 15.5q-33 0 -57.5 -24.5t-24.5 -61.5z" /> -<glyph unicode="æ" horiz-adv-x="1781" d="M16 236q0 393 689 393h67q14 74 14 116q0 184 -217 185q-152 -2 -301 -99l-45 117q18 12 50 29.5t126.5 47.5t184.5 30q279 0 317 -199h4q160 199 412 199q184 0 280.5 -101.5t96.5 -273.5l-29 -166h-776q-8 -41 -8 -88q0 -158 81.5 -242t229.5 -84q84 0 168 32t127 63 l43 30l45 -114q-18 -14 -53 -37t-135.5 -61t-196.5 -38q-164 0 -276.5 76t-147.5 205h-4q-12 -29 -41 -67.5t-80 -91t-134 -87.5t-179 -35q-133 0 -222.5 69t-89.5 192zM160 252q0 -68 50 -113t146 -45q137 0 244 117t143 262l11 41h-121q-473 0 -473 -262zM918 629h628 q4 45 4 67q0 121 -66.5 181.5t-168.5 60.5q-131 0 -237.5 -81t-159.5 -228z" /> -<glyph unicode="ç" horiz-adv-x="1128" d="M72 414q0 272 191.5 456.5t441.5 184.5q115 0 208 -37t127 -74l37 -37l-84 -94q-10 12 -31.5 31.5t-95 51.5t-155.5 32q-193 0 -344.5 -145.5t-151.5 -356.5q0 -145 93 -235.5t243 -90.5q188 0 346 133l14 13l43 -117q-6 -6 -18 -16.5t-54 -37t-86 -47t-113 -37 t-138 -16.5h-10l-33 -88q49 -8 84 -42.5t35 -90.5q0 -86 -68 -130t-154 -44l-110 12l20 95q35 -10 82 -11q119 0 119 80q0 59 -104 60l-31 -2l71 170q-172 27 -273 141.5t-101 288.5z" /> -<glyph unicode="è" horiz-adv-x="1132" d="M70 410q0 258 172 451.5t426 193.5q186 0 281 -102.5t95 -270.5q0 -35 -8 -79t-16 -71l-6 -24h-791q-8 -41 -8 -88q0 -139 86 -229.5t244 -90.5q82 0 166 32t127 63l43 30l45 -114q-18 -14 -52 -37t-135.5 -61t-197.5 -38q-211 0 -341 120t-130 315zM250 623h645 q6 35 6 71q0 119 -64.5 181.5t-168.5 62.5q-133 0 -249 -84t-169 -231zM526 1440h152l96 -244h-119z" /> -<glyph unicode="é" horiz-adv-x="1132" d="M70 410q0 258 172 451.5t426 193.5q186 0 281 -102.5t95 -270.5q0 -35 -8 -79t-16 -71l-6 -24h-791q-8 -41 -8 -88q0 -139 86 -229.5t244 -90.5q82 0 166 32t127 63l43 30l45 -114q-18 -14 -52 -37t-135.5 -61t-197.5 -38q-211 0 -341 120t-130 315zM250 623h645 q6 35 6 71q0 119 -64.5 181.5t-168.5 62.5q-133 0 -249 -84t-169 -231zM645 1196l191 244h172l-228 -244h-135z" /> -<glyph unicode="ê" horiz-adv-x="1132" d="M70 410q0 258 172 451.5t426 193.5q186 0 281 -102.5t95 -270.5q0 -35 -8 -79t-16 -71l-6 -24h-791q-8 -41 -8 -88q0 -139 86 -229.5t244 -90.5q82 0 166 32t127 63l43 30l45 -114q-18 -14 -52 -37t-135.5 -61t-197.5 -38q-211 0 -341 120t-130 315zM250 623h645 q6 35 6 71q0 119 -64.5 181.5t-168.5 62.5q-133 0 -249 -84t-169 -231zM463 1196l219 244h154l122 -244h-129l-77 166h-4l-144 -166h-141z" /> -<glyph unicode="ë" horiz-adv-x="1132" d="M70 410q0 258 172 451.5t426 193.5q186 0 281 -102.5t95 -270.5q0 -35 -8 -79t-16 -71l-6 -24h-791q-8 -41 -8 -88q0 -139 86 -229.5t244 -90.5q82 0 166 32t127 63l43 30l45 -114q-18 -14 -52 -37t-135.5 -61t-197.5 -38q-211 0 -341 120t-130 315zM250 623h645 q6 35 6 71q0 119 -64.5 181.5t-168.5 62.5q-133 0 -249 -84t-169 -231zM514 1264l35 176h125l-33 -176h-127zM823 1264l35 176h127l-35 -176h-127z" /> -<glyph unicode="ì" horiz-adv-x="475" d="M51 0l199 1030h139l-199 -1030h-139zM162 1440h151l97 -244h-119z" /> -<glyph unicode="í" horiz-adv-x="475" d="M51 0l199 1030h139l-199 -1030h-139zM283 1196l190 244h172l-227 -244h-135z" /> -<glyph unicode="î" horiz-adv-x="475" d="M51 0l199 1030h139l-199 -1030h-139zM98 1196l219 244h154l123 -244h-129l-78 166h-4l-143 -166h-142z" /> -<glyph unicode="ï" horiz-adv-x="475" d="M51 0l199 1030h139l-199 -1030h-139zM152 1264l34 176h125l-32 -176h-127zM461 1264l35 176h127l-35 -176h-127z" /> -<glyph unicode="ð" horiz-adv-x="1208" d="M66 383q0 221 160.5 397t418.5 176q184 0 283 -108l8 -10h4q-35 203 -192 333l-394 -161l-8 100l309 127q-117 70 -274 113l57 108q211 -55 361 -162l303 127l10 -100l-229 -94q209 -199 209 -506q0 -115 -36 -239t-105.5 -240.5t-192.5 -192.5t-277 -76q-199 0 -307 117 t-108 291zM209 387q0 -123 70.5 -205t201.5 -82q190 0 319.5 163t129.5 333q0 109 -76 175.5t-207 66.5q-180 0 -309 -133.5t-129 -317.5z" /> -<glyph unicode="ñ" horiz-adv-x="1216" d="M49 0l201 1030h135l-27 -147l-26 -97h4q49 96 174 182.5t281 86.5q141 0 217.5 -67.5t76.5 -199.5q0 -55 -16 -137l-127 -651h-139l119 616q16 76 16 138q0 170 -176 170q-170 0 -307.5 -132.5t-173.5 -314.5l-93 -477h-139zM444 1202q45 240 217 240q45 0 79 -22.5 t51.5 -51.5t42 -51.5t53.5 -22.5q78 0 104 142h111q-47 -240 -219 -240q-55 0 -93 37t-68 72.5t-65 35.5q-41 0 -66.5 -43t-35.5 -96h-111z" /> -<glyph unicode="ò" horiz-adv-x="1275" d="M68 426q0 258 192.5 443.5t439.5 185.5q209 0 340 -125t131 -320q0 -260 -194.5 -447.5t-437.5 -187.5q-209 0 -340 126t-131 325zM211 430q0 -145 91 -237.5t239 -92.5q186 0 336.5 148.5t150.5 355.5q0 143 -92 233.5t-238 90.5q-188 0 -337.5 -146.5t-149.5 -351.5z M559 1440h152l96 -244h-119z" /> -<glyph unicode="ó" horiz-adv-x="1275" d="M68 426q0 258 192.5 443.5t439.5 185.5q209 0 340 -125t131 -320q0 -260 -194.5 -447.5t-437.5 -187.5q-209 0 -340 126t-131 325zM211 430q0 -145 91 -237.5t239 -92.5q186 0 336.5 148.5t150.5 355.5q0 143 -92 233.5t-238 90.5q-188 0 -337.5 -146.5t-149.5 -351.5z M680 1196l190 244h172l-227 -244h-135z" /> -<glyph unicode="ô" horiz-adv-x="1275" d="M68 426q0 258 192.5 443.5t439.5 185.5q209 0 340 -125t131 -320q0 -260 -194.5 -447.5t-437.5 -187.5q-209 0 -340 126t-131 325zM211 430q0 -145 91 -237.5t239 -92.5q186 0 336.5 148.5t150.5 355.5q0 143 -92 233.5t-238 90.5q-188 0 -337.5 -146.5t-149.5 -351.5z M498 1196l219 244h153l123 -244h-129l-78 166h-4l-143 -166h-141z" /> -<glyph unicode="õ" horiz-adv-x="1275" d="M68 426q0 258 192.5 443.5t439.5 185.5q209 0 340 -125t131 -320q0 -260 -194.5 -447.5t-437.5 -187.5q-209 0 -340 126t-131 325zM211 430q0 -145 91 -237.5t239 -92.5q186 0 336.5 148.5t150.5 355.5q0 143 -92 233.5t-238 90.5q-188 0 -337.5 -146.5t-149.5 -351.5z M446 1202q45 240 218 240q45 0 78.5 -22.5t51 -51.5t42 -51.5t53.5 -22.5q78 0 104 142h111q-47 -240 -219 -240q-55 0 -93 37t-68 72.5t-65 35.5q-41 0 -66.5 -43t-35.5 -96h-111z" /> -<glyph unicode="ö" horiz-adv-x="1275" d="M68 426q0 258 192.5 443.5t439.5 185.5q209 0 340 -125t131 -320q0 -260 -194.5 -447.5t-437.5 -187.5q-209 0 -340 126t-131 325zM211 430q0 -145 91 -237.5t239 -92.5q186 0 336.5 148.5t150.5 355.5q0 143 -92 233.5t-238 90.5q-188 0 -337.5 -146.5t-149.5 -351.5z M549 1264l35 176h125l-33 -176h-127zM858 1264l35 176h127l-35 -176h-127z" /> -<glyph unicode="÷" horiz-adv-x="1316" d="M150 522v119h1003v-119h-1003zM573 125v151h154v-151h-154zM573 887v151h154v-151h-154z" /> -<glyph unicode="ø" horiz-adv-x="1275" d="M68 426q0 258 192.5 443.5t439.5 185.5q162 0 283 -80l107 117l77 -68l-106 -117q111 -121 110 -297q0 -260 -194.5 -447.5t-437.5 -187.5q-154 0 -269 70l-104 -113l-78 66l100 111q-120 124 -120 317zM211 430q0 -129 72 -217l606 661q-84 53 -191 54 q-188 0 -337.5 -146.5t-149.5 -351.5zM362 145q78 -45 179 -45q186 0 336.5 148.5t150.5 355.5q0 117 -63 199z" /> -<glyph unicode="ù" horiz-adv-x="1206" d="M94 242q0 55 17 137l125 651h139l-119 -612q-14 -74 -14 -142q0 -82 40 -126t140 -44q166 0 299 137.5t168 313.5l92 473h139l-200 -1030h-138l29 147l27 97h-4q-53 -98 -173 -183.5t-278 -85.5q-127 0 -208 65t-81 202zM518 1440h152l96 -244h-119z" /> -<glyph unicode="ú" horiz-adv-x="1206" d="M94 242q0 55 17 137l125 651h139l-119 -612q-14 -74 -14 -142q0 -82 40 -126t140 -44q166 0 299 137.5t168 313.5l92 473h139l-200 -1030h-138l29 147l27 97h-4q-53 -98 -173 -183.5t-278 -85.5q-127 0 -208 65t-81 202zM639 1196l190 244h172l-227 -244h-135z" /> -<glyph unicode="û" horiz-adv-x="1206" d="M94 242q0 55 17 137l125 651h139l-119 -612q-14 -74 -14 -142q0 -82 40 -126t140 -44q166 0 299 137.5t168 313.5l92 473h139l-200 -1030h-138l29 147l27 97h-4q-53 -98 -173 -183.5t-278 -85.5q-127 0 -208 65t-81 202zM455 1196l219 244h153l123 -244h-129l-78 166h-4 l-143 -166h-141z" /> -<glyph unicode="ü" horiz-adv-x="1206" d="M94 242q0 55 17 137l125 651h139l-119 -612q-14 -74 -14 -142q0 -82 40 -126t140 -44q166 0 299 137.5t168 313.5l92 473h139l-200 -1030h-138l29 147l27 97h-4q-53 -98 -173 -183.5t-278 -85.5q-127 0 -208 65t-81 202zM508 1264l35 176h125l-33 -176h-127zM817 1264 l35 176h127l-35 -176h-127z" /> -<glyph unicode="ý" horiz-adv-x="1021" d="M-184 -369l69 105q43 -41 115 -41q125 0 229 166l93 149l-234 1020h145l160 -770l19 -108h2q29 57 57 106l447 772h157l-753 -1249q-125 -211 -318 -211q-114 0 -188 61zM547 1196l190 244h172l-227 -244h-135z" /> -<glyph unicode="þ" horiz-adv-x="1212" d="M-29 -410l359 1850h137l-96 -504l-23 -86h4q55 86 151.5 145.5t219.5 59.5q180 0 280.5 -110.5t100.5 -303.5q0 -285 -168 -475.5t-389 -190.5q-115 0 -202 53.5t-122 153.5h-4q-2 -45 -12 -98l-96 -494h-140zM276 397q0 -129 66 -213t193 -84q162 0 292.5 147.5 t130.5 383.5q0 139 -68.5 218t-189.5 79q-180 0 -302 -165t-122 -366z" /> -<glyph unicode="ÿ" horiz-adv-x="1021" d="M-184 -369l69 105q43 -41 115 -41q125 0 229 166l93 149l-234 1020h145l160 -770l19 -108h2q29 57 57 106l447 772h157l-753 -1249q-125 -211 -318 -211q-114 0 -188 61zM416 1264l35 176h124l-32 -176h-127zM725 1264l35 176h127l-35 -176h-127z" /> -<glyph unicode="Œ" horiz-adv-x="1943" d="M121 588q0 231 118.5 433t317.5 320.5t422 118.5q51 0 144.5 -10t127.5 -10h711l-25 -127h-667l-103 -525h547l-26 -126h-547l-103 -535h705l-25 -127h-723q-29 0 -116.5 -10t-130.5 -10q-285 0 -456 170t-171 438zM266 582q0 -209 130 -340t354 -131q35 0 71.5 4t55.5 8 l20 4l229 1186q-63 16 -141 16q-293 0 -506 -221t-213 -526z" /> -<glyph unicode="œ" horiz-adv-x="2074" d="M68 426q0 258 192.5 443.5t439.5 185.5q156 0 267.5 -76t158.5 -203h4q80 127 206 203t276 76q184 0 279.5 -102.5t95.5 -270.5q0 -35 -8.5 -79t-16.5 -71l-6 -24h-789q-8 -41 -8 -88q0 -141 87 -230.5t241 -89.5q82 0 166 32t127 63l43 30l45 -114q-18 -14 -52 -37 t-135.5 -61t-197.5 -38q-162 0 -275.5 74t-156.5 207h-4q-88 -129 -224.5 -205t-281.5 -76q-209 0 -341 126t-132 325zM211 430q0 -145 92 -237.5t238 -92.5q186 0 337.5 148.5t151.5 355.5q0 143 -92 233.5t-238 90.5q-190 0 -339.5 -146.5t-149.5 -351.5zM1194 623h643 q6 35 6 71q0 119 -63.5 181.5t-169.5 62.5q-133 0 -248 -84t-168 -231z" /> -<glyph unicode="Ÿ" horiz-adv-x="1155" d="M176 1440h152l202 -522l58 -173h4q59 94 119 170l405 525h172l-649 -826l-121 -614h-141l123 618zM545 1608l35 176h125l-33 -176h-127zM854 1608l35 176h127l-35 -176h-127z" /> -<glyph unicode="ˆ" horiz-adv-x="1032" d="M125 1540l219 244h154l123 -244h-129l-78 166h-4l-144 -166h-141z" /> -<glyph unicode="˜" horiz-adv-x="1032" d="M74 1546q45 240 217 240q45 0 78.5 -22.5t51 -51.5t42 -51.5t53.5 -22.5q78 0 105 142h110q-47 -240 -219 -240q-55 0 -93 37t-67.5 73t-64.5 36q-41 0 -66.5 -43.5t-36.5 -96.5h-110z" /> -<glyph unicode="–" horiz-adv-x="1441" d="M193 522l22 119h1022l-20 -119h-1024z" /> -<glyph unicode="—" horiz-adv-x="1851" d="M193 522l22 119h1432l-21 -119h-1433z" /> -<glyph unicode="‘" horiz-adv-x="440" d="M205 1108l182 350h117l-146 -350h-153z" /> -<glyph unicode="’" horiz-adv-x="432" d="M211 1108l147 350h152l-182 -350h-117z" /> -<glyph unicode="‚" horiz-adv-x="495" d="M-43 -184l145 352h154l-182 -352h-117z" /> -<glyph unicode="“" horiz-adv-x="684" d="M205 1108l182 350h117l-146 -350h-153zM451 1108l182 350h117l-148 -350h-151z" /> -<glyph unicode="”" horiz-adv-x="677" d="M211 1108l147 350h152l-182 -350h-117zM457 1108l145 350h154l-183 -350h-116z" /> -<glyph unicode="„" horiz-adv-x="741" d="M-43 -184l147 352h152l-182 -352h-117zM203 -184l145 352h154l-183 -352h-116z" /> -<glyph unicode="•" horiz-adv-x="823" d="M115 596q0 121 86 207t206.5 86t205.5 -86t85 -207t-85 -207t-205.5 -86t-206.5 86t-86 207z" /> -<glyph unicode="…" horiz-adv-x="1458" d="M51 0l33 170h164l-33 -170h-164zM532 0l33 170h164l-33 -170h-164zM1014 0l33 170h163l-32 -170h-164z" /> -<glyph unicode="‹" horiz-adv-x="688" d="M90 582l393 417h160l-407 -428l258 -413h-140z" /> -<glyph unicode="›" horiz-adv-x="686" d="M31 158l407 428l-258 413h139l265 -424l-394 -417h-159z" /> -<glyph unicode="€" horiz-adv-x="1200" d="M68 545l18 104h113q6 84 30 166h-108l18 105h125q102 240 316.5 392t459.5 152l213 -28l-57 -127q-72 20 -158 20q-193 0 -360.5 -113.5t-255.5 -295.5h627l-41 -105h-629q-27 -92 -33 -166h598l-39 -104h-555q12 -190 129 -312t326 -122q45 0 92 7t72 13l24 8l6 -135 q-88 -29 -200 -29q-262 0 -426 158t-174 412h-131z" /> -<glyph unicode="™" horiz-adv-x="2027" d="M184 1333v107h758v-107h-321v-790h-117v790h-320zM1016 543l71 897h107l236 -514q18 -39 28 -84h4q10 45 29 84l235 514h107l70 -897h-113l-51 608l2 59h-4l-230 -499h-94l-229 499h-4l2 -59l-52 -608h-114z" /> -<glyph unicode="" horiz-adv-x="1030" d="M0 1030h1030v-1030h-1030v1030z" /> -<glyph unicode="fi" horiz-adv-x="1136" d="M102 0l179 911h-129l22 119h129l8 43q23 119 75 200t118.5 115.5t119 48t103.5 13.5l76 -4l-27 -125q-18 4 -47 4t-56.5 -4t-63.5 -20.5t-65.5 -43t-56 -75.5t-38.5 -115l-9 -37h611l-201 -1030h-139l176 911h-467l-178 -911h-140zM950 1266l37 174h150l-35 -174h-152z " /> -<glyph unicode="fl" horiz-adv-x="1167" d="M102 0l177 903h-129l22 119h129l10 53q23 117 75 198t118.5 115.5t119 48t103.5 13.5l76 -4l-27 -125q-18 4 -47 4t-56.5 -4t-63.5 -20.5t-65.5 -43t-56 -75.5t-38.5 -115l-11 -45h264l-22 -119h-262l-176 -903h-140zM741 182q0 35 9 74l231 1184h139l-227 -1166 q-6 -33 -6 -63q0 -41 16.5 -62.5t34.5 -25.5t45 -4l31 2l-27 -125q-23 -4 -47 -4q-78 0 -138.5 42t-60.5 148z" /> -<glyph unicode="ffi" horiz-adv-x="1798" d="M102 0l179 911h-129l22 119h129l8 43q23 119 75 200t118.5 115.5t119 48t103.5 13.5l76 -4l-27 -125q-18 4 -47 4t-56.5 -4t-63.5 -20.5t-65.5 -43t-56 -75.5t-38.5 -115l-9 -37h525l8 43q23 119 75 200t118.5 115.5t118.5 48t104 13.5l75 -4l-26 -125q-18 4 -47 4 t-56.5 -4t-63.5 -20.5t-65.5 -43t-56.5 -75.5t-39 -115l-8 -37h610l-201 -1030h-139l176 911h-467l-178 -911h-139l178 911h-522l-178 -911h-140zM1612 1266l37 174h149l-35 -174h-151z" /> -<glyph unicode="ffl" horiz-adv-x="1828" d="M102 0l179 911h-129l22 119h129l8 43q23 119 75 200t118.5 115.5t119 48t103.5 13.5l76 -4l-27 -125q-18 4 -47 4t-56.5 -4t-63.5 -20.5t-65.5 -43t-56 -75.5t-38.5 -115l-9 -37h523l8 43q23 119 75 200t118.5 115.5t118.5 47.5q51 14 103 14l76 -4l-26 -125q-18 4 -47 4 t-56.5 -4t-63.5 -20.5t-65.5 -43t-56.5 -75.5t-39 -115l-8 -37h264l-23 -119h-262l-178 -911h-139l178 911h-520l-178 -911h-140zM1403 182q0 35 8 74l232 1184h139l-228 -1166q-6 -33 -6 -63q0 -41 16.5 -62.5t35 -25.5t45.5 -4l30 2l-26 -125q-23 -4 -47 -4 q-78 0 -138.5 42t-60.5 148z" /> -</font> -</defs></svg>
\ No newline at end of file diff --git a/web/cobrands/stevenage/fonts/MuseoSans_300_Italic-webfont.ttf b/web/cobrands/stevenage/fonts/MuseoSans_300_Italic-webfont.ttf Binary files differdeleted file mode 100755 index 58241a2e9..000000000 --- a/web/cobrands/stevenage/fonts/MuseoSans_300_Italic-webfont.ttf +++ /dev/null diff --git a/web/cobrands/stevenage/fonts/MuseoSans_300_Italic-webfont.woff b/web/cobrands/stevenage/fonts/MuseoSans_300_Italic-webfont.woff Binary files differdeleted file mode 100755 index 95c94194f..000000000 --- a/web/cobrands/stevenage/fonts/MuseoSans_300_Italic-webfont.woff +++ /dev/null diff --git a/web/cobrands/stevenage/fonts/MuseoSans_500-webfont.eot b/web/cobrands/stevenage/fonts/MuseoSans_500-webfont.eot Binary files differdeleted file mode 100755 index 2731833c7..000000000 --- a/web/cobrands/stevenage/fonts/MuseoSans_500-webfont.eot +++ /dev/null diff --git a/web/cobrands/stevenage/fonts/MuseoSans_500-webfont.svg b/web/cobrands/stevenage/fonts/MuseoSans_500-webfont.svg deleted file mode 100755 index dd240b802..000000000 --- a/web/cobrands/stevenage/fonts/MuseoSans_500-webfont.svg +++ /dev/null @@ -1,227 +0,0 @@ -<?xml version="1.0" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" > -<svg xmlns="http://www.w3.org/2000/svg"> -<metadata> -This is a custom SVG webfont generated by Fontspring. -</metadata> -<defs> -<font id="MuseoSans500" horiz-adv-x="1681" > -<font-face units-per-em="2048" ascent="1536" descent="-512" /> -<missing-glyph horiz-adv-x="526" /> -<glyph unicode=" " horiz-adv-x="526" /> -<glyph unicode="	" horiz-adv-x="526" /> -<glyph unicode=" " horiz-adv-x="526" /> -<glyph unicode="!" horiz-adv-x="651" d="M223 1446h205l-12 -1049h-178zM225 0v199h203v-199h-203z" /> -<glyph unicode=""" horiz-adv-x="700" d="M129 1085v385h156v-385h-156zM416 1085v385h155v-385h-155z" /> -<glyph unicode="#" horiz-adv-x="1470" d="M90 391l25 152h268l59 344h-264l25 149h266l72 410h166l-72 -410h317l72 410h166l-72 -410h268l-26 -149h-266l-62 -344h266l-26 -152h-264l-70 -391h-166l68 391h-318l-67 -391h-166l67 391h-266zM549 543h317l62 344h-318z" /> -<glyph unicode="$" horiz-adv-x="1159" d="M111 166l114 153q6 -6 17.5 -16t50.5 -37.5t79 -48t101.5 -37t120.5 -16.5q106 0 178 57.5t72 155.5q0 82 -73 142.5t-177.5 104.5t-208.5 95t-177 139t-73 209q0 150 105.5 261.5t275.5 135.5v193h146v-191q102 -8 189 -42.5t124 -67.5l37 -31l-92 -168q-14 14 -42 34.5 t-111 55.5t-165 35q-115 0 -188.5 -61.5t-73.5 -149.5q0 -57 39 -103t101.5 -79t138 -63.5t151.5 -68.5t138.5 -85t101.5 -121t39 -168q0 -158 -104.5 -270.5t-282.5 -132.5v-189h-146v189q-231 23 -389 170z" /> -<glyph unicode="%" horiz-adv-x="1558" d="M98 1167q0 125 90.5 214t219.5 89t220 -89t91 -214t-91 -214t-220 -89t-219.5 88t-90.5 215zM129 0l1106 1446h192l-1105 -1446h-193zM256 1167q0 -66 44 -108.5t107.5 -42.5t107.5 43t44 108q0 63 -44 108.5t-107.5 45.5t-107.5 -45.5t-44 -108.5zM840 279q0 125 91 214 t220 89q127 0 219 -89.5t92 -214t-92 -214t-219 -89.5q-131 0 -221 88.5t-90 215.5zM999 279q0 -66 43 -109t109 -43q63 0 107.5 44t44.5 107.5t-44.5 108.5t-108 45t-107.5 -45t-44 -108z" /> -<glyph unicode="&" horiz-adv-x="1400" d="M111 406q0 123 68.5 227t185.5 143v4q-8 2 -20.5 8.5t-45.5 31t-58.5 57t-46 92t-20.5 129.5q0 176 124 274t320 98q35 0 79 -6t71 -10l27 -6l-52 -162q-59 12 -108 12q-111 0 -183.5 -59t-72.5 -162q0 -39 11 -74.5t38 -72.5t82 -58.5t135 -21.5h268v197h199v-197h193 v-176h-193v-193q0 -240 -133 -373t-367 -133q-223 0 -362 123.5t-139 307.5zM317 416q0 -106 82 -180t213 -74q143 0 222 81t79 246v185h-276q-154 0 -237 -67.5t-83 -190.5z" /> -<glyph unicode="'" horiz-adv-x="415" d="M129 1085v385h158v-385h-158z" /> -<glyph unicode="(" horiz-adv-x="618" d="M150 696q0 430 237 809h174q-231 -387 -231 -811q0 -469 231 -889h-174q-237 395 -237 891z" /> -<glyph unicode=")" horiz-adv-x="618" d="M57 -195q231 420 232 889q0 424 -232 811h174q238 -379 238 -809q0 -496 -238 -891h-174z" /> -<glyph unicode="*" horiz-adv-x="956" d="M74 1085l53 172l272 -102l-14 291h186l-16 -291l274 102l56 -172l-281 -75v-4l180 -226l-145 -106l-158 241h-4l-160 -241l-147 106l182 226v4z" /> -<glyph unicode="+" horiz-adv-x="1398" d="M158 504v160h458v503h168v-503h457v-160h-457v-504h-168v504h-458z" /> -<glyph unicode="," horiz-adv-x="522" d="M55 -207l127 422h203l-172 -422h-158z" /> -<glyph unicode="-" horiz-adv-x="966" d="M184 496v176h598v-176h-598z" /> -<glyph unicode="." horiz-adv-x="520" d="M156 0v211h209v-211h-209z" /> -<glyph unicode="/" horiz-adv-x="827" d="M74 -86l520 1610h176l-520 -1610h-176z" /> -<glyph unicode="0" horiz-adv-x="1280" d="M129 725q0 745 510 745q512 0 512 -745q0 -750 -512 -750q-510 0 -510 750zM336 725q0 -563 303 -563q305 0 305 563q0 559 -305 559q-303 0 -303 -559z" /> -<glyph unicode="1" horiz-adv-x="1001" d="M104 1110l347 336h180v-1270h315v-176h-831v176h319v934l2 90h-4q-16 -33 -70 -84l-135 -133z" /> -<glyph unicode="2" horiz-adv-x="1171" d="M113 111q0 121 52 224t131 170.5t171 135.5t171 122t131 127t52 150q0 106 -72.5 173t-187.5 67q-53 0 -103 -19.5t-83 -46t-58.5 -53t-37.5 -47.5l-11 -18l-149 100q6 10 16 29.5t50 66.5t88.5 83t129 65.5t172.5 29.5q201 0 329 -114.5t128 -300.5q0 -96 -38 -180 t-99 -144.5t-135 -116t-147.5 -104.5t-135 -98.5t-100.5 -109.5t-39 -126h717v-176h-932q-10 66 -10 111z" /> -<glyph unicode="3" horiz-adv-x="1161" d="M82 172l111 154q16 -18 44.5 -44t121 -70t184.5 -44q123 0 209 74.5t86 189.5q0 127 -96.5 196.5t-239.5 69.5h-101l-47 109l316 371l90 94v4q-43 -6 -123 -6h-490v176h865v-129l-394 -453q168 -18 296 -124.5t128 -299t-137 -329t-354 -136.5q-82 0 -161 20.5t-132 49.5 t-95 57.5t-61 49.5z" /> -<glyph unicode="4" horiz-adv-x="1241" d="M63 387v127l668 932h232v-887h196v-172h-196v-387h-199v387h-701zM287 559h477v526l8 144h-4q-33 -68 -72 -119l-409 -547v-4z" /> -<glyph unicode="5" horiz-adv-x="1153" d="M98 176l113 148q4 -6 13 -16.5t40 -38t64.5 -48t88 -37t111.5 -16.5q131 0 224.5 82t93.5 211t-94.5 213t-235.5 84q-63 0 -123.5 -18.5t-89.5 -34.5l-31 -19l-116 43l71 717h729v-176h-553l-34 -305l-11 -76h4q80 45 187 45q223 0 363.5 -136t140.5 -335 q0 -209 -146.5 -348.5t-365.5 -139.5q-248 0 -414 168z" /> -<glyph unicode="6" horiz-adv-x="1226" d="M121 657q0 143 40 283.5t116.5 261.5t204.5 194.5t290 73.5q76 0 145.5 -14t102.5 -31l33 -14l-66 -174q-92 47 -207 47q-186 0 -296.5 -142.5t-137.5 -342.5h4q45 61 134 99t186 38q203 0 329.5 -136t126.5 -341q0 -213 -131 -348.5t-333 -135.5q-236 0 -388.5 188.5 t-152.5 493.5zM334 561q0 -147 96 -273t229 -126q121 0 194 84t73 213q0 135 -81 220t-216 85q-121 0 -208 -61.5t-87 -141.5z" /> -<glyph unicode="7" horiz-adv-x="1083" d="M72 1270v176h966v-139l-653 -1307h-209l563 1139q18 37 39 69.5t33 48.5l12 15v4q-33 -6 -106 -6h-645z" /> -<glyph unicode="8" horiz-adv-x="1243" d="M117 418q0 76 28.5 146.5t74.5 120.5t74 74.5t54 43.5q-162 117 -162 289q0 156 117 267t334 111q203 0 329 -105t126 -282q0 -186 -172 -376q197 -121 196 -308q0 -174 -138 -299t-357.5 -125t-361.5 124t-142 319zM324 430q0 -121 88 -196.5t209 -75.5 q117 0 201.5 69.5t84.5 178.5q0 37 -18.5 70.5t-43 57t-71.5 51t-83 44t-97.5 44t-95.5 44.5q-174 -121 -174 -287zM387 1087q0 -29 10.5 -55t21.5 -46.5t39.5 -43t47 -35t59.5 -33t61.5 -29.5t71 -29.5t68.5 -29.5q127 127 127 285q0 98 -71.5 157.5t-186.5 59.5 q-117 0 -182.5 -57.5t-65.5 -143.5z" /> -<glyph unicode="9" horiz-adv-x="1226" d="M100 987q0 213 131 348t334 135q233 0 387 -188t154 -494q0 -143 -40 -283t-117 -261t-205 -195t-289 -74q-76 0 -146.5 14.5t-103.5 30.5l-31 15l66 176q92 -49 206 -49q186 0 297 142t138 343h-4q-43 -61 -133.5 -98t-186.5 -37q-203 0 -330 135t-127 340zM301 987 q0 -135 80 -220t217 -85q121 0 208 62.5t87 140.5q0 147 -96.5 273t-229.5 126q-123 0 -194.5 -84t-71.5 -213z" /> -<glyph unicode=":" horiz-adv-x="598" d="M195 0v211h208v-211h-208zM195 825v211h208v-211h-208z" /> -<glyph unicode=";" horiz-adv-x="600" d="M96 -207l109 422h205l-154 -422h-160zM207 825v211h209v-211h-209z" /> -<glyph unicode="<" horiz-adv-x="1142" d="M68 516v135l954 426v-182l-733 -309v-4l733 -310v-182z" /> -<glyph unicode="=" horiz-adv-x="1370" d="M197 309v160h977v-160h-977zM197 696v160h977v-160h-977z" /> -<glyph unicode=">" horiz-adv-x="1142" d="M121 90v182l731 310v4l-731 309v182l954 -426v-135z" /> -<glyph unicode="?" horiz-adv-x="1001" d="M66 1343q14 14 42.5 36t123 59t192.5 37q178 0 303 -104.5t125 -270.5q0 -94 -37 -169t-90 -125t-107.5 -96t-91.5 -103.5t-37 -125.5v-84h-194v97q0 86 36 156.5t87 119.5t102 94t87 101.5t36 119.5q0 86 -66.5 144.5t-166.5 58.5q-57 0 -115.5 -21.5t-89.5 -41.5 l-29 -23zM291 0v199h203v-199h-203z" /> -<glyph unicode="@" d="M121 493.5q0 317.5 217 537.5t530 220q276 0 404.5 -117.5t128.5 -297.5v-580h147v-150h-559q-186 0 -305 114t-119 274q0 158 118 270.5t306 112.5h221q-4 92 -91 151t-240 59q-236 0 -398 -175t-162 -418q0 -248 163 -418t419 -170v-162q-340 0 -560 216t-220 533.5z M766 496q0 -100 67.5 -170t170.5 -70h206v483h-202q-106 0 -174 -70.5t-68 -172.5z" /> -<glyph unicode="A" horiz-adv-x="1286" d="M16 0l521 1446h213l520 -1446h-211l-146 416h-544l-144 -416h-209zM422 584h438l-160 458l-55 205h-4q-33 -131 -57 -205z" /> -<glyph unicode="B" horiz-adv-x="1298" d="M197 0v1446h505q186 0 303 -98.5t117 -270.5q0 -104 -48 -186t-132 -125v-4q111 -33 174.5 -129t63.5 -221q0 -197 -132.5 -304.5t-332.5 -107.5h-518zM399 176h326q115 0 181.5 66.5t66.5 179.5q0 111 -68.5 179.5t-181.5 68.5h-324v-494zM399 838h303q96 0 154.5 61.5 t58.5 157.5t-57 154.5t-160 58.5h-299v-432z" /> -<glyph unicode="C" horiz-adv-x="1478" d="M98 731q0 315 210 527t526 212q98 0 188 -19t148.5 -47t103.5 -56.5t65 -49.5l21 -18l-100 -152q-18 18 -53.5 44t-145 70t-219.5 44q-238 0 -386.5 -158.5t-148.5 -394.5q0 -238 150.5 -404.5t386.5 -166.5q121 0 232.5 47t162.5 94l51 47l109 -145q-8 -10 -23.5 -25.5 t-70 -54.5t-115 -69.5t-155.5 -55.5t-197 -25q-322 0 -531 217t-209 539z" /> -<glyph unicode="D" horiz-adv-x="1515" d="M197 0v1446h479q336 0 534.5 -191.5t198.5 -529.5q0 -340 -198.5 -532.5t-534.5 -192.5h-479zM399 176h263q248 0 393 143.5t145 405.5q0 260 -145.5 402.5t-392.5 142.5h-263v-1094z" /> -<glyph unicode="E" horiz-adv-x="1173" d="M197 0v1446h839v-176h-637v-453h519v-176h-519v-465h672v-176h-874z" /> -<glyph unicode="F" horiz-adv-x="1067" d="M197 0v1446h796v-176h-594v-475h506v-177h-506v-618h-202z" /> -<glyph unicode="G" horiz-adv-x="1556" d="M100 725q0 315 211 530t527 215q96 0 186 -18t149.5 -43t104.5 -50.5t65 -43.5l21 -19l-102 -151q-18 16 -52 39.5t-140.5 62.5t-215.5 39q-248 0 -396.5 -158.5t-148.5 -398.5q0 -250 151.5 -408.5t381.5 -158.5q111 0 213 45t149 90l47 45v209h-235v176h420v-727h-179 v90l3 62h-5l-18 -19q-12 -12 -55 -43t-90.5 -53.5t-124 -42t-156.5 -19.5q-297 0 -504 212t-207 538z" /> -<glyph unicode="H" horiz-adv-x="1548" d="M197 0v1446h202v-635h750v635h203v-1446h-203v635h-750v-635h-202z" /> -<glyph unicode="I" horiz-adv-x="595" d="M197 0v1446h202v-1446h-202z" /> -<glyph unicode="J" horiz-adv-x="1099" d="M61 487h201v-61q0 -137 66.5 -200.5t163 -63.5t161 61.5t64.5 194.5v852h-365v176h568v-1030q0 -219 -127 -330t-303.5 -111t-302.5 112t-126 329v71z" /> -<glyph unicode="K" horiz-adv-x="1275" d="M197 0v1446h202v-608h215l365 608h223l-420 -686v-4l447 -756h-230l-385 664h-215v-664h-202z" /> -<glyph unicode="L" horiz-adv-x="1083" d="M197 0v1446h202v-1270h648v-176h-850z" /> -<glyph unicode="M" horiz-adv-x="1773" d="M152 0l116 1446h213l332 -782l72 -195h4q39 115 72 195l331 782h213l117 -1446h-201l-71 911l-2 213h-5q-43 -133 -77 -213l-289 -651h-180l-287 651q-33 78 -78 217h-4q2 -129 -4 -217l-70 -911h-202z" /> -<glyph unicode="N" horiz-adv-x="1550" d="M197 0v1446h200l643 -940q25 -35 54.5 -87t48.5 -87l18 -35h4q-14 129 -14 209v940h203v-1446h-199l-645 938q-53 80 -121 211h-4q14 -129 14 -211v-938h-202z" /> -<glyph unicode="O" d="M98 733q0 311 215 524t528.5 213t527.5 -213t214 -524q0 -319 -214 -538.5t-527.5 -219.5t-528.5 219.5t-215 538.5zM307 733q0 -242 155.5 -406.5t379 -164.5t378 165t154.5 406q0 236 -154.5 394.5t-378 158.5t-379 -158.5t-155.5 -394.5z" /> -<glyph unicode="P" horiz-adv-x="1243" d="M197 0v1446h528q201 0 328 -124t127 -329t-128 -331.5t-327 -126.5h-326v-535h-202zM399 711h293q131 0 206 75.5t75 206.5q0 129 -75 203t-204 74h-295v-559z" /> -<glyph unicode="Q" horiz-adv-x="1705" d="M100 731q0 313 214 526t528 213q315 0 529 -213t214 -526q0 -270 -170 -477l172 -164l-119 -127l-168 168q-195 -156 -458 -156q-313 0 -527.5 219.5t-214.5 536.5zM309 731q0 -242 153.5 -405.5t379.5 -163.5q180 0 313 106l-170 166l119 127l166 -168q106 147 106 338 q0 238 -153.5 396.5t-380.5 158.5q-225 0 -379 -158.5t-154 -396.5z" /> -<glyph unicode="R" horiz-adv-x="1312" d="M197 0v1446h442q182 0 270 -33q113 -41 178.5 -145.5t65.5 -245.5q0 -139 -70.5 -245.5t-189.5 -145.5v-4q16 -18 43 -66l307 -561h-229l-305 575h-310v-575h-202zM399 752h291q119 0 187.5 70.5t68.5 191.5q0 160 -115 223q-61 33 -198 33h-234v-518z" /> -<glyph unicode="S" horiz-adv-x="1118" d="M86 166l115 153q6 -6 17 -16t50 -37.5t79 -48t101.5 -37t120.5 -16.5q106 0 178 57.5t72 155.5q0 63 -39 112.5t-100.5 84t-136 66.5t-149.5 68.5t-136 82t-100 116t-39 160.5q0 170 132 286.5t335 116.5q119 0 221 -36.5t145 -73.5l43 -35l-92 -168q-14 14 -41.5 34.5 t-110.5 55.5t-165 35q-113 0 -187.5 -61.5t-74.5 -149.5q0 -82 71.5 -139.5t175 -98t207 -90t175 -140.5t71.5 -220q0 -174 -125 -291t-334 -117q-86 0 -167 19.5t-135 47.5t-96 56.5t-61 48.5z" /> -<glyph unicode="T" horiz-adv-x="1214" d="M10 1270v176h1194v-176h-495v-1270h-203v1270h-496z" /> -<glyph unicode="U" horiz-adv-x="1490" d="M176 512v934h203v-934q0 -164 98 -257t266 -93q170 0 269.5 93t99.5 261v930h203v-934q0 -240 -158 -388.5t-411.5 -148.5t-411.5 148.5t-158 388.5z" /> -<glyph unicode="V" horiz-adv-x="1294" d="M12 1446h219l359 -1022l55 -199h4q29 121 56 199l362 1022h215l-532 -1446h-203z" /> -<glyph unicode="W" horiz-adv-x="1941" d="M68 1446h208l256 -1061q18 -78 27 -154h4q10 74 31 154l283 1061h180l282 -1061l31 -154h4q6 76 27 154l266 1061h209l-379 -1446h-235l-250 938q-25 92 -43 205h-4q-18 -113 -43 -205l-250 -938h-236z" /> -<glyph unicode="X" horiz-adv-x="1253" d="M45 0l457 745l-428 701h233l228 -391l92 -172h4q41 92 88 172l227 391h234l-428 -701l456 -745h-229l-262 444l-92 166h-4q-39 -86 -86 -166l-263 -444h-227z" /> -<glyph unicode="Y" horiz-adv-x="1204" d="M16 1446h230l268 -475l88 -183h4q43 100 88 183l264 475h230l-483 -834v-612h-203v612z" /> -<glyph unicode="Z" horiz-adv-x="1243" d="M84 0v135l696 1004q25 37 50.5 69.5t39.5 48.5l15 15v4q-39 -6 -109 -6h-655v176h1016v-133l-697 -1006q-25 -35 -51.5 -67.5t-40.5 -46.5l-12 -17v-4q39 4 108 4h701v-176h-1061z" /> -<glyph unicode="[" horiz-adv-x="616" d="M207 -195v1700h338v-149h-164v-1399h164v-152h-338z" /> -<glyph unicode="\" horiz-adv-x="827" d="M57 1524h176l521 -1610h-176z" /> -<glyph unicode="]" horiz-adv-x="618" d="M72 -43h166v1399h-166v149h340v-1700h-340v152z" /> -<glyph unicode="^" horiz-adv-x="1255" d="M141 506l410 940h129l407 -940h-178l-295 721l-292 -721h-181z" /> -<glyph unicode="_" horiz-adv-x="1216" d="M57 0h1102v-160h-1102v160z" /> -<glyph unicode="`" horiz-adv-x="1021" d="M330 1806h213l149 -260h-168z" /> -<glyph unicode="a" horiz-adv-x="1081" d="M72 291q0 356 624 356h45v19q0 227 -227 227q-156 -2 -289 -100l-82 145q16 14 48 34.5t132.5 54.5t206.5 34q197 0 303.5 -104.5t106.5 -301.5v-655h-184v98l4 82h-4l-12 -22q-7 -14 -34.5 -49t-61.5 -62t-94 -49.5t-130 -22.5q-143 0 -247.5 84.5t-104.5 231.5z M272 301q0 -68 51.5 -117t143.5 -49q119 0 197.5 103.5t78.5 226.5v33h-51q-420 0 -420 -197z" /> -<glyph unicode="b" horiz-adv-x="1228" d="M156 0v1446h198v-473l-4 -88h4q4 6 11.5 18t36 43t62.5 53.5t94 42t128 19.5q207 0 331 -149.5t124 -393.5t-132 -393.5t-339 -149.5q-66 0 -123.5 18.5t-92 45.5t-61 52.5t-37.5 43.5l-12 19h-4q4 -33 4 -78v-76h-188zM348 514q0 -150 77 -259.5t216 -109.5 q127 0 213 99.5t86 271.5q0 168 -81 269.5t-212 101.5q-127 0 -213 -93.5t-86 -279.5z" /> -<glyph unicode="c" horiz-adv-x="1120" d="M82 518q0 231 156.5 387t398.5 156q115 0 212 -38t138 -77l39 -37l-94 -139q-12 12 -36 32.5t-98.5 53.5t-152.5 33q-156 0 -258 -104.5t-102 -264.5t103.5 -266.5t262.5 -106.5q86 0 166 35t117 70l37 35l80 -146l-18 -17q-11 -11 -50 -40t-84 -50.5t-115.5 -40 t-146.5 -18.5q-244 0 -399.5 153.5t-155.5 389.5z" /> -<glyph unicode="d" horiz-adv-x="1230" d="M88 518q0 246 131 394.5t338 148.5q68 0 125 -16.5t91 -41t59.5 -49t35.5 -41.5l9 -16h4q-4 31 -4 70v479h198v-1446h-188v98l2 70h-4q-4 -8 -11.5 -20.5t-35 -46t-63.5 -59.5t-97.5 -46.5t-132.5 -20.5q-209 0 -333 149.5t-124 393.5zM291 518q0 -168 81 -269.5 t212 -101.5q127 0 213 93.5t86 279.5q0 150 -77 259.5t-216 109.5q-127 0 -213 -99.5t-86 -271.5z" /> -<glyph unicode="e" horiz-adv-x="1136" d="M84 518q0 244 146.5 393.5t371.5 149.5q211 0 330 -137.5t119 -348.5l-7 -86h-755q8 -164 109.5 -253t246.5 -89q164 0 299 115l8 6l82 -145q-16 -16 -49 -41t-137.5 -66t-214.5 -41q-242 0 -395.5 155t-153.5 388zM295 639h553q-4 129 -75 196.5t-175 67.5 q-117 0 -200 -69.5t-103 -194.5z" /> -<glyph unicode="f" horiz-adv-x="688" d="M82 862v160h129v49q0 98 28.5 171t69.5 113t98.5 63.5t101.5 30.5t91 7l76 -6v-170q-20 4 -51 4q-35 0 -67 -7t-68.5 -27.5t-59 -67.5t-22.5 -115v-45h245v-160h-245v-862h-197v862h-129z" /> -<glyph unicode="g" horiz-adv-x="1214" d="M88 542.5q0 229.5 121 374t332 144.5q213 0 311 -131l14 -23h4q-2 14 -2 33v96h191v-993q0 -123 -44 -217t-120 -148.5t-166 -81t-192 -26.5q-186 0 -355 86l66 156q129 -70 284 -70q147 0 237.5 70.5t90.5 220.5v76l2 65h-4q-96 -162 -307 -162t-337 150.5t-126 380z M289 547q0 -164 81 -263.5t220 -99.5q121 0 197.5 84t76.5 273q0 348 -293 348q-133 0 -207.5 -91t-74.5 -251z" /> -<glyph unicode="h" horiz-adv-x="1234" d="M156 1446h198v-531l-4 -86h4q41 90 141.5 161t241.5 71q356 0 357 -397v-664h-199v618q0 125 -41 193t-155.5 68t-205 -72t-122.5 -184q-16 -55 -17 -138v-485h-198v1446z" /> -<glyph unicode="i" horiz-adv-x="509" d="M154 1243v203h200v-203h-200zM156 0v1036h198v-1036h-198z" /> -<glyph unicode="j" horiz-adv-x="507" d="M-113 -248q18 -2 45 -2q35 0 68 8.5t71 28.5t61.5 69.5t23.5 120.5v1059h196v-1071q0 -121 -42 -205t-109.5 -119.5t-125 -49t-118.5 -13.5l-70 4v170zM154 1243v203h200v-203h-200z" /> -<glyph unicode="k" horiz-adv-x="1077" d="M156 0v1446h198v-791h146l282 381h226l-344 -456v-5l383 -575h-232l-311 487h-150v-487h-198z" /> -<glyph unicode="l" horiz-adv-x="542" d="M143 283v1163h199v-1129q0 -86 28.5 -116.5t82.5 -30.5l34 2v-176q-31 -4 -65 -4q-279 0 -279 291z" /> -<glyph unicode="m" horiz-adv-x="1871" d="M156 1036h192v-137l-4 -76h4q39 96 139.5 167t217.5 71q258 0 311 -236h4q45 98 146.5 167t222.5 69q342 0 342 -397v-664h-199v621q0 125 -38 192.5t-146 67.5q-104 0 -183.5 -76t-107.5 -189q-14 -59 -15 -143v-473h-198v621q0 123 -36 191.5t-144.5 68.5t-187.5 -78 t-109 -195q-12 -49 -13 -135v-473h-198v1036z" /> -<glyph unicode="n" horiz-adv-x="1234" d="M156 1036h192v-137l-4 -76h4q41 88 139.5 163t249.5 75q356 0 357 -397v-664h-199v618q0 125 -41 193t-156 68q-117 0 -206 -71t-121 -183q-16 -55 -17 -140v-485h-198v1036z" /> -<glyph unicode="o" horiz-adv-x="1277" d="M80 520.5q0 233.5 161.5 387t397 153.5t397.5 -153.5t162 -387t-163 -389.5t-396 -156t-396 156t-163 389.5zM283 520q0 -160 104.5 -266.5t251.5 -106.5q150 0 253 105.5t103 267.5q0 160 -103.5 264.5t-252.5 104.5q-147 0 -251.5 -104.5t-104.5 -264.5z" /> -<glyph unicode="p" horiz-adv-x="1228" d="M156 1036h182v-88l-4 -76h4q4 8 11 20.5t37 45.5t65.5 57.5t98 45t136.5 20.5q207 0 331 -149.5t124 -393.5t-132 -393.5t-337 -149.5q-63 0 -119.5 17.5t-91.5 43t-60.5 50.5t-35.5 41l-11 18h-4q4 -37 4 -90v-465h-198v1446zM348 514q0 -150 79 -259.5t214 -109.5 q127 0 213 99.5t86 271.5q0 168 -81 269.5t-212 101.5q-127 0 -213 -93.5t-86 -279.5z" /> -<glyph unicode="q" horiz-adv-x="1230" d="M88 518q0 246 131 394.5t338 148.5q68 0 126 -18.5t93 -43t61.5 -50t36.5 -44.5l11 -18h4q-2 31 -2 71v78h188v-1446h-198v473l4 91h-4q-4 -8 -11.5 -19.5t-35 -42.5t-62.5 -54.5t-94.5 -43t-128.5 -19.5q-209 0 -333 149.5t-124 393.5zM291 518q0 -168 81 -269.5 t212 -101.5q127 0 213 93.5t86 279.5q0 150 -77 259.5t-216 109.5q-127 0 -213 -99.5t-86 -271.5z" /> -<glyph unicode="r" horiz-adv-x="768" d="M156 0v1036h192v-180l-4 -78h4q37 119 124 195t204 76l51 -5v-196q-27 6 -57 6q-96 0 -176 -65.5t-115 -178.5q-25 -80 -25 -186v-424h-198z" /> -<glyph unicode="s" horiz-adv-x="917" d="M72 127l96 141q12 -14 36.5 -33.5t102.5 -53.5t158 -34q70 0 121 35t51 94q0 51 -55.5 90.5t-133 69t-155.5 65.5t-133.5 103.5t-55.5 161.5q0 137 106.5 216t268.5 79q100 0 184.5 -28.5t116.5 -57.5l33 -29l-80 -149q-10 10 -29.5 25.5t-86 41t-140.5 25.5 q-72 0 -121 -32t-49 -95q0 -51 55.5 -88t133 -66.5t155.5 -65.5t133.5 -103.5t55.5 -162.5q0 -131 -103.5 -216t-271.5 -85q-113 0 -211 38t-139 77z" /> -<glyph unicode="t" horiz-adv-x="733" d="M63 862v160h142v299h192v-299h250v-160h-250v-461q0 -59 16.5 -103t40 -68.5t55.5 -39t57.5 -18.5t51.5 -4l48 4v-176q-29 -4 -70 -4q-49 0 -94 6t-102.5 30.5t-99.5 64.5t-71.5 114t-29.5 172v483h-136z" /> -<glyph unicode="u" horiz-adv-x="1224" d="M141 373v663h199v-618q0 -125 40 -191.5t155 -66.5q152 0 243.5 114.5t91.5 276.5v485h199v-1036h-192v137l4 76h-4q-39 -90 -140.5 -164t-240.5 -74q-355 1 -355 398z" /> -<glyph unicode="v" horiz-adv-x="1028" d="M14 1036h211l252 -700q8 -25 16.5 -60.5t14.5 -58.5l4 -22h4l4 22q6 23 15.5 58.5t17.5 60.5l252 700h209l-383 -1036h-230z" /> -<glyph unicode="w" horiz-adv-x="1667" d="M35 1036h211l215 -727q6 -23 13 -51.5t9 -44.5l4 -14h5q10 57 26 110l225 725h183l223 -725l29 -110h4q8 57 24 110l217 727h209l-334 -1036h-219l-215 666l-28 112h-5q-12 -59 -28 -112l-213 -666h-221z" /> -<glyph unicode="x" horiz-adv-x="1040" d="M45 0l352 532l-334 504h228l192 -315l35 -62h4q18 35 35 62l193 315h227l-334 -504l352 -532h-225l-217 346l-31 57h-4q-16 -33 -31 -57l-217 -346h-225z" /> -<glyph unicode="y" horiz-adv-x="1044" d="M4 1036h223l260 -678l39 -125h4q16 70 35 123l252 680h215l-485 -1222q-47 -117 -136 -180.5t-200 -63.5q-51 0 -101.5 16.5t-74.5 32.5l-25 14l70 152q57 -43 121 -43q123 0 186 152l51 118z" /> -<glyph unicode="z" horiz-adv-x="1058" d="M80 0v115l522 655l86 96v4q-33 -4 -100 -4h-486v170h854v-114l-522 -658l-88 -94v-4q35 4 103 4h526v-170h-895z" /> -<glyph unicode="{" horiz-adv-x="716" d="M100 578v176q6 0 18.5 2t42 16t53.5 36.5t42 68t18 104.5v172q0 92 26 160.5t61.5 104.5t86 58.5t86 27.5t72.5 5l47 -2v-151h-28q-27 0 -50.5 -7.5t-55.5 -26.5t-51 -65.5t-19 -115.5v-211q0 -57 -17.5 -104.5t-42 -75t-48.5 -47t-42 -27.5l-16 -6v-4q6 -2 17 -6.5 t40 -25t50.5 -47t39.5 -74.5q19 -47 19 -107v-236q0 -70 19 -116t51 -65.5t55.5 -26.5t50.5 -7h28v-152q-18 -4 -47 -4q-37 0 -72.5 5.5t-86 28t-86 58t-61.5 105.5t-26 162v196q0 59 -18 103.5t-43 66t-50.5 34.5t-43.5 15z" /> -<glyph unicode="|" horiz-adv-x="579" d="M203 -326v1948h174v-1948h-174z" /> -<glyph unicode="}" horiz-adv-x="716" d="M63 -45h29q27 0 50.5 7t55 26.5t51 65.5t19.5 116v235q0 94 42 159t83 83l41 19v4q-6 2 -17 7t-40 25.5t-50.5 47t-40 74.5t-18.5 106v211q0 70 -19.5 116t-51 65t-55 26.5t-50.5 7.5h-29v151q18 2 48 2q37 0 72.5 -5t85.5 -27.5t86 -58.5t61.5 -104.5t25.5 -160.5v-172 q0 -172 138 -219l36 -8v-176q-6 0 -18 -2.5t-42 -16.5t-53.5 -35.5t-42 -65.5t-18.5 -104v-196q0 -92 -25.5 -162t-61.5 -105.5t-86 -58t-86 -28t-72 -5.5l-48 4v152z" /> -<glyph unicode="~" horiz-adv-x="1245" d="M137 418q0 174 75 260t212 86q72 0 130 -32t89 -68.5t76 -68.5t96 -32q74 0 105.5 57.5t31.5 135.5h162q0 -346 -285 -346q-72 0 -130 30.5t-88.5 68.5t-77 68.5t-97.5 30.5q-72 0 -104.5 -57t-32.5 -133h-162z" /> -<glyph unicode="¡" horiz-adv-x="591" d="M193 -410l14 1049h178l12 -1049h-204zM193 838v198h202v-198h-202z" /> -<glyph unicode="¢" horiz-adv-x="1179" d="M109 723q0 227 116.5 388t315.5 187v172h145v-172q133 -20 232.5 -103t152.5 -214l-180 -70q-90 203 -273 203q-143 0 -225 -109.5t-82 -281.5q0 -176 80 -282.5t227 -106.5q184 0 273 203l180 -72q-55 -125 -152.5 -213t-232.5 -102v-177h-145v177q-199 27 -315.5 187.5 t-116.5 385.5z" /> -<glyph unicode="£" horiz-adv-x="1210" d="M115 0v176h125v477h-90v144h90v278q0 170 126 282.5t318 112.5q186 0 332 -120l10 -11l-117 -141q-98 88 -223 88q-111 0 -176.5 -62.5t-65.5 -156.5v-270h377v-144h-377v-477h666v-176h-995z" /> -<glyph unicode="¥" horiz-adv-x="1243" d="M57 1446h232l241 -451l88 -209h5q43 113 88 209l243 451h232l-340 -606h209v-129h-277l-55 -99v-75h332v-129h-332v-408h-205v408h-334v129h334v75l-55 99h-279v129h211z" /> -<glyph unicode="§" horiz-adv-x="905" d="M98 -23l90 138q84 -76 199 -76q94 0 155.5 56.5t61.5 158.5q0 41 -12 92l-135 770h161l144 -799q10 -55 10 -92q0 -156 -104.5 -254t-280.5 -98q-80 0 -151.5 26.5t-104.5 51.5zM129 1120q0 154 104.5 252t282.5 98q78 0 150.5 -26.5t105.5 -50.5l33 -27l-94 -131 q-82 70 -195 70q-96 0 -157.5 -53.5t-61.5 -153.5q0 -37 12 -82l140 -789h-164l-144 799q-12 47 -12 94z" /> -<glyph unicode="¨" horiz-adv-x="1021" d="M258 1599v207h164v-207h-164zM600 1599v207h164v-207h-164z" /> -<glyph unicode="©" d="M111 723q0 311 212 529t515 218q305 0 519 -218t214 -529t-214 -529.5t-519 -218.5q-303 0 -515 218.5t-212 529.5zM260 723q0 -256 167 -432t411 -176q248 0 415.5 176t167.5 432t-168 432t-415 176q-244 0 -411 -176t-167 -432zM449 721q0 168 111.5 288.5t291.5 120.5 q195 0 311 -165l23 -37l-125 -68q-8 14 -23.5 36t-67.5 57.5t-112 35.5q-117 0 -185.5 -79t-68.5 -189q0 -115 67.5 -191.5t186.5 -76.5q59 0 110.5 32.5t71.5 63.5l21 33l125 -68q-4 -8 -12.5 -21.5t-38 -49t-64.5 -62.5t-94 -48.5t-125 -21.5q-180 0 -291.5 120 t-111.5 290z" /> -<glyph unicode="ª" horiz-adv-x="864" d="M150 543v116h563v-116h-563zM152 981q0 225 385 225h20v13q0 129 -131 129q-39 0 -82 -14.5t-65 -28.5l-23 -15l-59 101q92 76 247 75q127 0 194 -66.5t67 -191.5v-411h-140v94h-4q-6 -12 -19.5 -30.5t-61.5 -48.5t-107 -30q-88 0 -154.5 53.5t-66.5 145.5zM299 991 q0 -37 27.5 -62.5t76.5 -25.5q68 0 111 56.5t43 125.5v17h-25q-233 0 -233 -111z" /> -<glyph unicode="«" horiz-adv-x="1138" d="M90 578l336 421h199l-336 -421l336 -420h-199zM502 578l336 421h198l-336 -421l336 -420h-198z" /> -<glyph unicode="¬" horiz-adv-x="1257" d="M123 696v160h977v-547h-166v387h-811z" /> -<glyph unicode="­" horiz-adv-x="882" d="M143 496v176h598v-176h-598z" /> -<glyph unicode="®" d="M111 723q0 311 212 529t515 218q305 0 519 -218t214 -529t-214 -529.5t-519 -218.5q-303 0 -515 218.5t-212 529.5zM260 723q0 -256 167 -432t411 -176q248 0 415.5 176t167.5 432t-168 432t-415 176q-244 0 -411 -176t-167 -432zM588 340v772h297q111 0 177 -64.5 t66 -170.5q0 -82 -43 -136.5t-98 -68.5v-4q8 -8 27 -43l147 -285h-160l-143 299h-125v-299h-145zM733 745h123q57 0 91 35t34 97q0 59 -34 91.5t-91 32.5h-123v-256z" /> -<glyph unicode="¯" horiz-adv-x="1021" d="M250 1606v143h522v-143h-522z" /> -<glyph unicode="°" horiz-adv-x="796" d="M88 1167q0 125 90 214t219 89t220.5 -89t91.5 -214t-91.5 -214t-220.5 -89t-219 88t-90 215zM246 1167.5q0 -63.5 44 -107.5t107.5 -44t107.5 44t44 107.5t-44 108.5t-107.5 45t-107.5 -45t-44 -108.5z" /> -<glyph unicode="±" horiz-adv-x="1394" d="M156 504v160h458v503h168v-503h457v-160h-457v-504h-168v504h-458zM188 -195h1018v-159h-1018v159z" /> -<glyph unicode="²" horiz-adv-x="796" d="M96 940q0 96 45 171t108.5 121t127 86t108.5 87t45 102q0 57 -42 95t-105 38q-96 -4 -172 -98l-100 92l11 16.5t32.5 35t56.5 44t79 36t101 16.5q127 0 211 -75t84 -194q0 -82 -42 -147.5t-103.5 -107t-123 -78.5t-105.5 -81t-48 -98h436v-135h-598q0 8 -2 23.5t-3 28 t-1 22.5z" /> -<glyph unicode="³" horiz-adv-x="796" d="M82 981l86 109q8 -12 24.5 -29t70.5 -45.5t114 -28.5q68 0 119 45t51 111q0 68 -54.5 106.5t-127.5 38.5h-70l-33 78l182 211l50 49v4q-39 -6 -74 -6h-289v137h555v-98l-223 -258q102 -14 170.5 -81t68.5 -181q0 -121 -91 -209t-228 -88q-92 0 -167 33.5t-105 66.5z" /> -<glyph unicode="´" horiz-adv-x="1021" d="M330 1546l149 260h213l-196 -260h-166z" /> -<glyph unicode="µ" horiz-adv-x="1267" d="M170 -410v1446h199v-618q0 -125 40 -191.5t152 -66.5q154 0 246 114.5t92 276.5v485h199v-1036h-193v141l4 72h-6q-4 -10 -12 -25.5t-40 -56.5t-72 -72.5t-108.5 -57.5t-148.5 -26q-131 2 -186 64h-4q14 -100 14 -160v-289h-176z" /> -<glyph unicode="μ" horiz-adv-x="1267" d="M170 -410v1446h199v-618q0 -125 40 -191.5t152 -66.5q154 0 246 114.5t92 276.5v485h199v-1036h-193v141l4 72h-6q-4 -10 -12 -25.5t-40 -56.5t-72 -72.5t-108.5 -57.5t-148.5 -26q-131 2 -186 64h-4q14 -100 14 -160v-289h-176z" /> -<glyph unicode="¶" horiz-adv-x="1208" d="M88 970.5q0 200.5 142.5 338t340.5 137.5h557v-176h-401v-1372h-154v596q-199 0 -342 138t-143 338.5zM854 -102v1255h152v-1255h-152z" /> -<glyph unicode="·" horiz-adv-x="563" d="M180 489v211h203v-211h-203z" /> -<glyph unicode="¸" horiz-adv-x="1021" d="M350 -291q41 -14 86 -14q98 0 98.5 63.5t-108.5 63.5l-37 -2l60 227l100 -20v-17l-25 -112q66 -8 107 -47t41 -103q0 -88 -60.5 -130t-148.5 -42l-113 14v119z" /> -<glyph unicode="¹" horiz-adv-x="796" d="M133 1550l217 211h139v-760h187v-135h-531v135h191v510l4 54h-4q-8 -18 -37 -45l-72 -70z" /> -<glyph unicode="º" horiz-adv-x="956" d="M127 1130q0 145 101.5 241.5t246.5 96.5q147 0 249.5 -96t102.5 -242q0 -150 -101 -247t-248.5 -97t-249 97t-101.5 247zM160 543v116h639v-116h-639zM274 1130q0 -92 58.5 -152t144.5 -60q84 0 142.5 60t58.5 152q0 90 -58.5 148.5t-142.5 58.5q-86 0 -144.5 -58.5 t-58.5 -148.5z" /> -<glyph unicode="»" horiz-adv-x="1140" d="M102 158l336 420l-336 421h199l336 -421l-336 -420h-199zM516 158l336 420l-336 421h199l336 -421l-336 -420h-199z" /> -<glyph unicode="¼" horiz-adv-x="1980" d="M109 1235l217 211h139v-760h186v-135h-530v135h190v510l4 53h-4q-8 -18 -37 -45l-71 -69zM535 0l688 1446h153l-688 -1446h-153zM1167 219v103l412 573h166v-541h125v-135h-125v-219h-152v219h-426zM1335 354h258v252l6 119h-4q-29 -55 -59 -98l-201 -269v-4z" /> -<glyph unicode="½" horiz-adv-x="1968" d="M109 1235l217 211h139v-760h186v-135h-530v135h190v510l4 53h-4q-8 -18 -37 -45l-71 -69zM539 0l688 1446h153l-688 -1446h-153zM1229 74q0 96 45 170.5t108.5 121t127 86.5t108.5 87t45 102q0 57 -42 95t-105 38q-96 -4 -173 -98l-100 92q4 6 11.5 16.5t33 35t56 44 t78.5 35.5t102 16q127 0 211 -74.5t84 -193.5q0 -82 -42 -147.5t-103.5 -107.5t-123 -79t-105.5 -81t-48 -97h436v-135h-598q0 8 -2 23.5t-3 28t-1 22.5z" /> -<glyph unicode="¾" horiz-adv-x="2004" d="M82 666l86 108q8 -12 24.5 -28.5t70.5 -45t114 -28.5q68 0 119 45t51 110q0 68 -54.5 107t-127.5 39h-70l-33 78l182 211l50 49v4q-39 -6 -74 -6h-289v137h555v-98l-223 -258q102 -14 170.5 -81t68.5 -182q0 -121 -91 -209t-228 -88q-92 0 -167 34t-105 67zM559 0 l688 1446h154l-688 -1446h-154zM1192 219v103l412 573h165v-541h125v-135h-125v-219h-151v219h-426zM1360 354h258v252l6 119h-4q-29 -55 -59 -98l-201 -269v-4z" /> -<glyph unicode="¿" horiz-adv-x="921" d="M80 -57q0 94 37 168.5t90 125t107.5 96.5t91 104.5t36.5 125.5v76h193v-88q0 -86 -36 -157.5t-86 -120t-101.5 -93.5t-87 -101t-35.5 -120q0 -86 66.5 -145.5t166.5 -59.5q57 0 115.5 22.5t87.5 43.5l31 22l108 -141q-6 -6 -16 -14.5t-45 -31t-74 -39.5t-98.5 -31.5 t-122.5 -14.5q-178 0 -303 103.5t-125 269.5zM438 838v198h203v-198h-203z" /> -<glyph unicode="À" horiz-adv-x="1286" d="M16 0l521 1446h213l520 -1446h-211l-146 416h-544l-144 -416h-209zM369 1806h213l149 -260h-168zM422 584h438l-160 458l-55 205h-4q-33 -131 -57 -205z" /> -<glyph unicode="Á" horiz-adv-x="1286" d="M16 0l521 1446h213l520 -1446h-211l-146 416h-544l-144 -416h-209zM422 584h438l-160 458l-55 205h-4q-33 -131 -57 -205zM553 1546l149 260h213l-196 -260h-166z" /> -<glyph unicode="Â" horiz-adv-x="1286" d="M16 0l521 1446h213l520 -1446h-211l-146 416h-544l-144 -416h-209zM358 1546l181 260h206l181 -260h-174l-109 164h-4l-107 -164h-174zM422 584h438l-160 458l-55 205h-4q-33 -131 -57 -205z" /> -<glyph unicode="Ã" horiz-adv-x="1286" d="M16 0l521 1446h213l520 -1446h-211l-146 416h-544l-144 -416h-209zM299 1548q0 260 209 260q59 0 104 -34.5t82 -69.5t72 -35q41 0 60.5 40t19.5 93h143q0 -260 -209 -260q-59 0 -104 35t-82 69.5t-72 34.5q-80 0 -80 -133h-143zM422 584h438l-160 458l-55 205h-4 q-33 -131 -57 -205z" /> -<glyph unicode="Ä" horiz-adv-x="1286" d="M16 0l521 1446h213l520 -1446h-211l-146 416h-544l-144 -416h-209zM391 1599v207h164v-207h-164zM422 584h438l-160 458l-55 205h-4q-33 -131 -57 -205zM733 1599v207h164v-207h-164z" /> -<glyph unicode="Å" horiz-adv-x="1286" d="M16 0l521 1446h213l520 -1446h-211l-146 416h-544l-144 -416h-209zM422 584h438l-160 458l-55 205h-4q-33 -131 -57 -205zM469 1673q0 70 51 112t123 42t123 -42t51 -112q0 -68 -51 -109.5t-123 -41.5t-123 41.5t-51 109.5zM575 1673q0 -29 18.5 -48t49.5 -19 q29 0 48.5 19.5t19.5 47.5q0 33 -19.5 52.5t-48.5 19.5q-31 0 -49.5 -19.5t-18.5 -52.5z" /> -<glyph unicode="Æ" horiz-adv-x="1798" d="M8 0l598 1446h1057v-176h-639v-453h520v-176h-520v-465h674v-176h-875v643h-346l-258 -643h-211zM545 811h278v459h-94z" /> -<glyph unicode="Ç" horiz-adv-x="1482" d="M102 731q0 315 210 527t526 212q98 0 188 -19t148.5 -47t103.5 -56.5t65 -49.5l21 -18l-100 -152q-18 18 -53 44t-145 70t-220 44q-238 0 -386.5 -158.5t-148.5 -394.5q0 -238 150.5 -404.5t386.5 -166.5q121 0 232.5 47t162.5 94l51 47l109 -145q-8 -8 -22.5 -23.5 t-65.5 -52.5t-108.5 -66.5t-147.5 -56t-187 -31.5l-16 -77q66 -8 107 -47t41 -103q0 -88 -60.5 -130t-148.5 -42l-113 14v119q41 -14 86 -14q98 0 98 63.5t-108 63.5l-37 -2l41 160q-291 27 -475.5 238.5t-184.5 512.5z" /> -<glyph unicode="È" horiz-adv-x="1173" d="M197 0v1446h839v-176h-637v-453h519v-176h-519v-465h672v-176h-874zM365 1806h213l149 -260h-168z" /> -<glyph unicode="É" horiz-adv-x="1173" d="M197 0v1446h839v-176h-637v-453h519v-176h-519v-465h672v-176h-874zM551 1546l149 260h213l-196 -260h-166z" /> -<glyph unicode="Ê" horiz-adv-x="1173" d="M197 0v1446h839v-176h-637v-453h519v-176h-519v-465h672v-176h-874zM356 1546l181 260h206l181 -260h-174l-109 164h-4l-107 -164h-174z" /> -<glyph unicode="Ë" horiz-adv-x="1173" d="M197 0v1446h839v-176h-637v-453h519v-176h-519v-465h672v-176h-874zM387 1599v207h164v-207h-164zM729 1599v207h164v-207h-164z" /> -<glyph unicode="Ì" horiz-adv-x="595" d="M25 1806h213l149 -260h-168zM197 0v1446h202v-1446h-202z" /> -<glyph unicode="Í" horiz-adv-x="595" d="M197 0v1446h202v-1446h-202zM211 1546l149 260h213l-196 -260h-166z" /> -<glyph unicode="Î" horiz-adv-x="595" d="M14 1546l181 260h206l181 -260h-174l-109 164h-4l-107 -164h-174zM197 0v1446h202v-1446h-202z" /> -<glyph unicode="Ï" horiz-adv-x="595" d="M47 1599v207h164v-207h-164zM197 0v1446h202v-1446h-202zM389 1599v207h164v-207h-164z" /> -<glyph unicode="Ð" horiz-adv-x="1554" d="M115 639v168h121v639h479q336 0 534.5 -191.5t198.5 -529.5q0 -340 -198.5 -532.5t-534.5 -192.5h-479v639h-121zM438 176h262q248 0 393.5 143.5t145.5 405.5q0 260 -145.5 402.5t-393.5 142.5h-262v-463h305v-168h-305v-463z" /> -<glyph unicode="Ñ" horiz-adv-x="1550" d="M197 0v1446h200l643 -940q25 -35 54.5 -87t48.5 -87l18 -35h4q-14 129 -14 209v940h203v-1446h-199l-645 938q-53 80 -121 211h-4q14 -129 14 -211v-938h-202zM430 1548q0 260 209 260q59 0 104 -34.5t82 -69.5t72 -35q41 0 60.5 40t19.5 93h143q0 -260 -209 -260 q-59 0 -104 35t-82 69.5t-72 34.5q-80 0 -80 -133h-143z" /> -<glyph unicode="Ò" d="M98 733q0 311 215 524t528.5 213t527.5 -213t214 -524q0 -319 -214 -538.5t-527.5 -219.5t-528.5 219.5t-215 538.5zM307 733q0 -242 155.5 -406.5t379 -164.5t378 165t154.5 406q0 236 -154.5 394.5t-378 158.5t-379 -158.5t-155.5 -394.5zM567 1806h213l150 -260h-168z " /> -<glyph unicode="Ó" d="M98 733q0 311 215 524t528.5 213t527.5 -213t214 -524q0 -319 -214 -538.5t-527.5 -219.5t-528.5 219.5t-215 538.5zM307 733q0 -242 155.5 -406.5t379 -164.5t378 165t154.5 406q0 236 -154.5 394.5t-378 158.5t-379 -158.5t-155.5 -394.5zM754 1546l149 260h213 l-196 -260h-166z" /> -<glyph unicode="Ô" d="M98 733q0 311 215 524t528.5 213t527.5 -213t214 -524q0 -319 -214 -538.5t-527.5 -219.5t-528.5 219.5t-215 538.5zM307 733q0 -242 155.5 -406.5t379 -164.5t378 165t154.5 406q0 236 -154.5 394.5t-378 158.5t-379 -158.5t-155.5 -394.5zM557 1546l180 260h207 l180 -260h-174l-108 164h-4l-107 -164h-174z" /> -<glyph unicode="Õ" d="M98 733q0 311 215 524t528.5 213t527.5 -213t214 -524q0 -319 -214 -538.5t-527.5 -219.5t-528.5 219.5t-215 538.5zM307 733q0 -242 155.5 -406.5t379 -164.5t378 165t154.5 406q0 236 -154.5 394.5t-378 158.5t-379 -158.5t-155.5 -394.5zM498 1548q0 260 209 260 q59 0 104 -34.5t82 -69.5t72 -35q41 0 60 40t19 93h144q0 -260 -209 -260q-59 0 -104.5 35t-82 69.5t-71.5 34.5q-80 0 -80 -133h-143z" /> -<glyph unicode="Ö" d="M98 733q0 311 215 524t528.5 213t527.5 -213t214 -524q0 -319 -214 -538.5t-527.5 -219.5t-528.5 219.5t-215 538.5zM307 733q0 -242 155.5 -406.5t379 -164.5t378 165t154.5 406q0 236 -154.5 394.5t-378 158.5t-379 -158.5t-155.5 -394.5zM590 1599v207h164v-207h-164z M932 1599v207h164v-207h-164z" /> -<glyph unicode="×" horiz-adv-x="1320" d="M129 113l422 471l-422 471l113 112l417 -467l420 467l113 -112l-424 -471l424 -471l-113 -113l-420 465l-417 -465z" /> -<glyph unicode="Ø" horiz-adv-x="1687" d="M102 733q0 311 215 524t529 213q205 0 379 -100l94 129l100 -69l-94 -132q123 -102 192.5 -248.5t69.5 -316.5q0 -319 -214 -538.5t-527 -219.5q-217 0 -393 109l-97 -135l-102 69l100 142q-119 104 -185.5 252.5t-66.5 320.5zM311 733q0 -246 160 -411l641 890 q-121 74 -266 74q-223 0 -379 -158.5t-156 -394.5zM567 242q125 -80 279 -80q223 0 377.5 165t154.5 406q0 248 -168 406z" /> -<glyph unicode="Ù" horiz-adv-x="1490" d="M176 512v934h203v-934q0 -164 98 -257t266 -93q170 0 269.5 93t99.5 261v930h203v-934q0 -240 -158 -388.5t-411.5 -148.5t-411.5 148.5t-158 388.5zM471 1806h213l150 -260h-168z" /> -<glyph unicode="Ú" horiz-adv-x="1490" d="M176 512v934h203v-934q0 -164 98 -257t266 -93q170 0 269.5 93t99.5 261v930h203v-934q0 -240 -158 -388.5t-411.5 -148.5t-411.5 148.5t-158 388.5zM655 1546l150 260h213l-197 -260h-166z" /> -<glyph unicode="Û" horiz-adv-x="1490" d="M176 512v934h203v-934q0 -164 98 -257t266 -93q170 0 269.5 93t99.5 261v930h203v-934q0 -240 -158 -388.5t-411.5 -148.5t-411.5 148.5t-158 388.5zM461 1546l180 260h207l180 -260h-174l-109 164h-4l-106 -164h-174z" /> -<glyph unicode="Ü" horiz-adv-x="1490" d="M176 512v934h203v-934q0 -164 98 -257t266 -93q170 0 269.5 93t99.5 261v930h203v-934q0 -240 -158 -388.5t-411.5 -148.5t-411.5 148.5t-158 388.5zM494 1599v207h163v-207h-163zM836 1599v207h163v-207h-163z" /> -<glyph unicode="Ý" horiz-adv-x="1204" d="M16 1446h230l268 -475l88 -183h4q43 100 88 183l264 475h230l-483 -834v-612h-203v612zM514 1546l150 260h213l-197 -260h-166z" /> -<glyph unicode="Þ" horiz-adv-x="1243" d="M197 1446h200v-246h328q201 0 327 -124t126 -328.5t-127 -331.5t-328 -127h-326v-289h-200v1446zM397 465h295q131 0 206 75.5t75 207.5q0 129 -75 202.5t-204 73.5h-297v-559z" /> -<glyph unicode="ß" horiz-adv-x="1204" d="M156 0v1085q0 180 131 282.5t311 102.5q168 0 278.5 -95t110.5 -234q0 -68 -31.5 -126.5t-70.5 -93t-71 -77.5t-32 -84q0 -35 38 -72t92.5 -73.5t107.5 -78.5t91 -104.5t38 -134.5q0 -147 -102.5 -229t-247.5 -82q-84 0 -157 14t-103 29l-31 16v176q115 -63 266 -63 q74 0 123 36.5t49 110.5q0 55 -57.5 109.5t-126 94.5t-125.5 105.5t-57 139.5q0 57 32.5 110.5t70.5 89t70.5 86t32.5 99.5q0 66 -51 112.5t-143 46.5q-98 0 -168 -59t-70 -168v-1071h-198z" /> -<glyph unicode="à" horiz-adv-x="1081" d="M72 291q0 356 624 356h45v19q0 227 -227 227q-156 -2 -289 -100l-82 145q16 14 48 34.5t132.5 54.5t206.5 34q197 0 303.5 -104.5t106.5 -301.5v-655h-184v98l4 82h-4l-12 -22q-7 -14 -34.5 -49t-61.5 -62t-94 -49.5t-130 -22.5q-143 0 -247.5 84.5t-104.5 231.5z M264 1446h213l150 -260h-168zM272 301q0 -68 51.5 -117t143.5 -49q119 0 197.5 103.5t78.5 226.5v33h-51q-420 0 -420 -197z" /> -<glyph unicode="á" horiz-adv-x="1081" d="M72 291q0 356 624 356h45v19q0 227 -227 227q-156 -2 -289 -100l-82 145q16 14 48 34.5t132.5 54.5t206.5 34q197 0 303.5 -104.5t106.5 -301.5v-655h-184v98l4 82h-4l-12 -22q-7 -14 -34.5 -49t-61.5 -62t-94 -49.5t-130 -22.5q-143 0 -247.5 84.5t-104.5 231.5z M272 301q0 -68 51.5 -117t143.5 -49q119 0 197.5 103.5t78.5 226.5v33h-51q-420 0 -420 -197zM446 1186l150 260h213l-197 -260h-166z" /> -<glyph unicode="â" horiz-adv-x="1081" d="M72 291q0 356 624 356h45v19q0 227 -227 227q-156 -2 -289 -100l-82 145q16 14 48 34.5t132.5 54.5t206.5 34q197 0 303.5 -104.5t106.5 -301.5v-655h-184v98l4 82h-4l-12 -22q-7 -14 -34.5 -49t-61.5 -62t-94 -49.5t-130 -22.5q-143 0 -247.5 84.5t-104.5 231.5z M252 1186l180 260h207l180 -260h-174l-108 164h-5l-106 -164h-174zM272 301q0 -68 51.5 -117t143.5 -49q119 0 197.5 103.5t78.5 226.5v33h-51q-420 0 -420 -197z" /> -<glyph unicode="ã" horiz-adv-x="1081" d="M72 291q0 356 624 356h45v19q0 227 -227 227q-156 -2 -289 -100l-82 145q16 14 48 34.5t132.5 54.5t206.5 34q197 0 303.5 -104.5t106.5 -301.5v-655h-184v98l4 82h-4l-12 -22q-7 -14 -34.5 -49t-61.5 -62t-94 -49.5t-130 -22.5q-143 0 -247.5 84.5t-104.5 231.5z M193 1188q0 260 208 260q59 0 104.5 -35t82.5 -69.5t71 -34.5q41 0 60.5 40t19.5 93h144q0 -260 -209 -260q-59 0 -104.5 34.5t-82 69.5t-71.5 35q-80 0 -80 -133h-143zM272 301q0 -68 51.5 -117t143.5 -49q119 0 197.5 103.5t78.5 226.5v33h-51q-420 0 -420 -197z" /> -<glyph unicode="ä" horiz-adv-x="1081" d="M72 291q0 356 624 356h45v19q0 227 -227 227q-156 -2 -289 -100l-82 145q16 14 48 34.5t132.5 54.5t206.5 34q197 0 303.5 -104.5t106.5 -301.5v-655h-184v98l4 82h-4l-12 -22q-7 -14 -34.5 -49t-61.5 -62t-94 -49.5t-130 -22.5q-143 0 -247.5 84.5t-104.5 231.5z M272 301q0 -68 51.5 -117t143.5 -49q119 0 197.5 103.5t78.5 226.5v33h-51q-420 0 -420 -197zM285 1239v207h164v-207h-164zM627 1239v207h164v-207h-164z" /> -<glyph unicode="å" horiz-adv-x="1081" d="M72 291q0 356 624 356h45v19q0 227 -227 227q-156 -2 -289 -100l-82 145q16 14 48 34.5t132.5 54.5t206.5 34q197 0 303.5 -104.5t106.5 -301.5v-655h-184v98l4 82h-4l-12 -22q-7 -14 -34.5 -49t-61.5 -62t-94 -49.5t-130 -22.5q-143 0 -247.5 84.5t-104.5 231.5z M272 301q0 -68 51.5 -117t143.5 -49q119 0 197.5 103.5t78.5 226.5v33h-51q-420 0 -420 -197zM362 1313q0 70 51.5 111.5t123 41.5t123 -42t51.5 -111q0 -68 -51.5 -110t-123 -42t-123 42t-51.5 110zM469 1313q0 -29 18.5 -48.5t49.5 -19.5q29 0 48 19.5t19 48.5 q0 33 -19.5 52t-47.5 19q-31 0 -49.5 -19t-18.5 -52z" /> -<glyph unicode="æ" horiz-adv-x="1769" d="M74 291q0 92 45 160.5t109.5 104.5t155.5 58.5t160.5 27.5t147.5 5h51v19q0 227 -233 227q-70 0 -140.5 -24.5t-107.5 -49.5l-37 -26l-80 145q6 4 17.5 13.5t48.5 29.5t78 36.5t105.5 30t129.5 13.5q260 0 344 -182h4q123 182 379 182q203 0 317.5 -142.5t114.5 -361.5 l-4 -59h-743q8 -170 103.5 -260.5t240.5 -90.5q80 0 156.5 30t113.5 61l37 28l82 -143q-16 -16 -49 -41t-137.5 -66t-212.5 -41q-154 0 -268.5 69t-178.5 192h-4q-10 -29 -32.5 -65t-67.5 -84t-121 -80t-170 -32q-150 0 -252 85.5t-102 230.5zM276 301q0 -70 50.5 -118 t144.5 -48q121 0 197.5 103.5t76.5 228.5v31h-96q-373 0 -373 -197zM944 647h539q-4 125 -74 190.5t-172 65.5q-117 0 -195 -64.5t-98 -191.5z" /> -<glyph unicode="ç" horiz-adv-x="1122" d="M84 518q0 231 156.5 387t398.5 156q115 0 212 -38t136 -77l41 -37l-94 -139q-12 12 -36 32.5t-98.5 53.5t-152.5 33q-156 0 -258 -104.5t-102 -264.5t103.5 -266.5t262.5 -106.5q86 0 166 35t117 70l37 35l80 -146l-17 -16q-10 -10 -47 -38t-79 -49.5t-108.5 -41 t-137.5 -21.5l-17 -77q66 -8 107 -47t41 -103q0 -88 -60.5 -130t-148.5 -42l-113 14v119q41 -14 86 -14q98 0 98 63.5t-108 63.5l-37 -2l41 162q-209 29 -339 176t-130 360z" /> -<glyph unicode="è" horiz-adv-x="1136" d="M84 518q0 244 146.5 393.5t371.5 149.5q211 0 330 -137.5t119 -348.5l-7 -86h-755q8 -164 109.5 -253t246.5 -89q164 0 299 115l8 6l82 -145q-16 -16 -49 -41t-137.5 -66t-214.5 -41q-242 0 -395.5 155t-153.5 388zM295 639h553q-4 129 -75 196.5t-175 67.5 q-117 0 -200 -69.5t-103 -194.5zM330 1446h213l149 -260h-168z" /> -<glyph unicode="é" horiz-adv-x="1136" d="M84 518q0 244 146.5 393.5t371.5 149.5q211 0 330 -137.5t119 -348.5l-7 -86h-755q8 -164 109.5 -253t246.5 -89q164 0 299 115l8 6l82 -145q-16 -16 -49 -41t-137.5 -66t-214.5 -41q-242 0 -395.5 155t-153.5 388zM295 639h553q-4 129 -75 196.5t-175 67.5 q-117 0 -200 -69.5t-103 -194.5zM514 1186l150 260h213l-197 -260h-166z" /> -<glyph unicode="ê" horiz-adv-x="1136" d="M84 518q0 244 146.5 393.5t371.5 149.5q211 0 330 -137.5t119 -348.5l-7 -86h-755q8 -164 109.5 -253t246.5 -89q164 0 299 115l8 6l82 -145q-16 -16 -49 -41t-137.5 -66t-214.5 -41q-242 0 -395.5 155t-153.5 388zM295 639h553q-4 129 -75 196.5t-175 67.5 q-117 0 -200 -69.5t-103 -194.5zM317 1186l181 260h207l180 -260h-174l-109 164h-4l-106 -164h-175z" /> -<glyph unicode="ë" horiz-adv-x="1136" d="M84 518q0 244 146.5 393.5t371.5 149.5q211 0 330 -137.5t119 -348.5l-7 -86h-755q8 -164 109.5 -253t246.5 -89q164 0 299 115l8 6l82 -145q-16 -16 -49 -41t-137.5 -66t-214.5 -41q-242 0 -395.5 155t-153.5 388zM295 639h553q-4 129 -75 196.5t-175 67.5 q-117 0 -200 -69.5t-103 -194.5zM350 1239v207h164v-207h-164zM692 1239v207h164v-207h-164z" /> -<glyph unicode="ì" horiz-adv-x="509" d="M-18 1446h213l149 -260h-168zM156 0v1036h198v-1036h-198z" /> -<glyph unicode="í" horiz-adv-x="509" d="M156 0v1036h198v-1036h-198zM168 1186l149 260h213l-196 -260h-166z" /> -<glyph unicode="î" horiz-adv-x="509" d="M-27 1186l181 260h206l181 -260h-174l-109 164h-4l-107 -164h-174zM156 0v1036h198v-1036h-198z" /> -<glyph unicode="ï" horiz-adv-x="509" d="M4 1239v207h164v-207h-164zM156 0v1036h198v-1036h-198zM346 1239v207h164v-207h-164z" /> -<glyph unicode="ð" horiz-adv-x="1206" d="M88 481q0 193 130 333t355 140q158 -2 252 -86h4q-61 164 -223 273l-370 -164l-21 127l254 113q-125 63 -264 94l55 162q238 -53 424 -164l285 125l18 -125l-188 -86q295 -246 295 -660q0 -109 -30 -209t-89.5 -187t-163.5 -139.5t-238 -52.5q-223 0 -354 150.5 t-131 355.5zM289 477q0 -135 76.5 -232.5t212.5 -97.5q80 0 142 34t98 91.5t54.5 122t18.5 133.5q0 117 -79 192t-210 75q-150 0 -231.5 -93.5t-81.5 -224.5z" /> -<glyph unicode="ñ" horiz-adv-x="1234" d="M156 1036h192v-137l-4 -76h4q41 88 139.5 163t249.5 75q356 0 357 -397v-664h-199v618q0 125 -41 193t-156 68q-117 0 -206 -71t-121 -183q-16 -55 -17 -140v-485h-198v1036zM297 1188q0 260 209 260q59 0 104 -35t82 -69.5t72 -34.5q41 0 60.5 40t19.5 93h143 q0 -260 -209 -260q-59 0 -104 34.5t-82 69.5t-72 35q-80 0 -80 -133h-143z" /> -<glyph unicode="ò" horiz-adv-x="1277" d="M80 520.5q0 233.5 161.5 387t397 153.5t397.5 -153.5t162 -387t-163 -389.5t-396 -156t-396 156t-163 389.5zM283 520q0 -160 104.5 -266.5t251.5 -106.5q150 0 253 105.5t103 267.5q0 160 -103.5 264.5t-252.5 104.5q-147 0 -251.5 -104.5t-104.5 -264.5zM365 1446h213 l149 -260h-168z" /> -<glyph unicode="ó" horiz-adv-x="1277" d="M80 520.5q0 233.5 161.5 387t397 153.5t397.5 -153.5t162 -387t-163 -389.5t-396 -156t-396 156t-163 389.5zM283 520q0 -160 104.5 -266.5t251.5 -106.5q150 0 253 105.5t103 267.5q0 160 -103.5 264.5t-252.5 104.5q-147 0 -251.5 -104.5t-104.5 -264.5zM551 1186 l149 260h213l-196 -260h-166z" /> -<glyph unicode="ô" horiz-adv-x="1277" d="M80 520.5q0 233.5 161.5 387t397 153.5t397.5 -153.5t162 -387t-163 -389.5t-396 -156t-396 156t-163 389.5zM283 520q0 -160 104.5 -266.5t251.5 -106.5q150 0 253 105.5t103 267.5q0 160 -103.5 264.5t-252.5 104.5q-147 0 -251.5 -104.5t-104.5 -264.5zM356 1186 l181 260h206l181 -260h-174l-109 164h-4l-107 -164h-174z" /> -<glyph unicode="õ" horiz-adv-x="1277" d="M80 520.5q0 233.5 161.5 387t397 153.5t397.5 -153.5t162 -387t-163 -389.5t-396 -156t-396 156t-163 389.5zM283 520q0 -160 104.5 -266.5t251.5 -106.5q150 0 253 105.5t103 267.5q0 160 -103.5 264.5t-252.5 104.5q-147 0 -251.5 -104.5t-104.5 -264.5zM295 1188 q0 260 209 260q59 0 104 -35t82 -69.5t72 -34.5q41 0 60.5 40t19.5 93h143q0 -260 -209 -260q-59 0 -104 34.5t-82 69.5t-72 35q-80 0 -80 -133h-143z" /> -<glyph unicode="ö" horiz-adv-x="1277" d="M80 520.5q0 233.5 161.5 387t397 153.5t397.5 -153.5t162 -387t-163 -389.5t-396 -156t-396 156t-163 389.5zM283 520q0 -160 104.5 -266.5t251.5 -106.5q150 0 253 105.5t103 267.5q0 160 -103.5 264.5t-252.5 104.5q-147 0 -251.5 -104.5t-104.5 -264.5zM387 1239v207 h164v-207h-164zM729 1239v207h164v-207h-164z" /> -<glyph unicode="÷" horiz-adv-x="1300" d="M133 504v160h1034v-160h-1034zM553 90v186h192v-186h-192zM553 891v186h192v-186h-192z" /> -<glyph unicode="ø" horiz-adv-x="1277" d="M80 520q0 233 161.5 387t397.5 154q147 0 276 -68l82 113l97 -70l-80 -110q184 -158 184 -406q0 -233 -163 -389t-396 -156q-137 0 -262 60l-80 -113l-98 72l75 106q-194 158 -194 420zM283 520q0 -160 102 -266l426 592q-82 43 -172 43q-147 0 -251.5 -104.5 t-104.5 -264.5zM483 182q74 -35 156 -35q150 0 253 105.5t103 267.5q0 147 -92 250z" /> -<glyph unicode="ù" horiz-adv-x="1224" d="M141 373v663h199v-618q0 -125 40 -191.5t155 -66.5q152 0 243.5 114.5t91.5 276.5v485h199v-1036h-192v137l4 76h-4q-39 -90 -140.5 -164t-240.5 -74q-355 1 -355 398zM332 1446h213l149 -260h-168z" /> -<glyph unicode="ú" horiz-adv-x="1224" d="M141 373v663h199v-618q0 -125 40 -191.5t155 -66.5q152 0 243.5 114.5t91.5 276.5v485h199v-1036h-192v137l4 76h-4q-39 -90 -140.5 -164t-240.5 -74q-355 1 -355 398zM516 1186l150 260h213l-197 -260h-166z" /> -<glyph unicode="û" horiz-adv-x="1224" d="M141 373v663h199v-618q0 -125 40 -191.5t155 -66.5q152 0 243.5 114.5t91.5 276.5v485h199v-1036h-192v137l4 76h-4q-39 -90 -140.5 -164t-240.5 -74q-355 1 -355 398zM322 1186l180 260h207l180 -260h-174l-109 164h-4l-106 -164h-174z" /> -<glyph unicode="ü" horiz-adv-x="1224" d="M141 373v663h199v-618q0 -125 40 -191.5t155 -66.5q152 0 243.5 114.5t91.5 276.5v485h199v-1036h-192v137l4 76h-4q-39 -90 -140.5 -164t-240.5 -74q-355 1 -355 398zM354 1239v207h164v-207h-164zM696 1239v207h164v-207h-164z" /> -<glyph unicode="ý" horiz-adv-x="1044" d="M4 1036h223l260 -678l39 -125h4q16 70 35 123l252 680h215l-485 -1222q-47 -117 -136 -180.5t-200 -63.5q-51 0 -101.5 16.5t-74.5 32.5l-25 14l70 152q57 -43 121 -43q123 0 186 152l51 118zM440 1186l150 260h213l-197 -260h-166z" /> -<glyph unicode="þ" horiz-adv-x="1228" d="M156 -410v1856h198v-471l-2 -86h4q2 2 18.5 22.5t30 36t43 38t60.5 37.5t77 26.5t97 11.5q209 0 335 -151.5t126 -391t-130 -391.5t-337 -152q-66 0 -124 17.5t-93 43t-59.5 50.5t-34.5 41l-11 18h-4q4 -37 4 -90v-465h-198zM348 516q0 -162 81 -265.5t216 -103.5 q127 0 211 102.5t84 268.5q0 164 -80 267.5t-211 103.5q-129 0 -215 -92.5t-86 -280.5z" /> -<glyph unicode="ÿ" horiz-adv-x="1044" d="M4 1036h223l260 -678l39 -125h4q16 70 35 123l252 680h215l-485 -1222q-47 -117 -136 -180.5t-200 -63.5q-51 0 -101.5 16.5t-74.5 32.5l-25 14l70 152q57 -43 121 -43q123 0 186 152l51 118zM276 1239v207h164v-207h-164zM618 1239v207h164v-207h-164z" /> -<glyph unicode="Œ" horiz-adv-x="1966" d="M98 725q0 313 214 526t534 213q53 0 136 -9t116 -9h733v-176h-639v-453h520v-176h-520v-465h676v-176h-768q-33 0 -117 -9t-137 -9q-317 0 -532.5 214t-215.5 529zM307 725q0 -242 151.5 -404.5t387.5 -162.5q37 0 72.5 3t54.5 7l18 4v1102q-63 16 -145 16 q-236 0 -387.5 -162.5t-151.5 -402.5z" /> -<glyph unicode="œ" horiz-adv-x="2048" d="M82 516q0 240 160.5 392.5t392.5 152.5q301 0 448 -246h4q131 246 426 246q211 0 330 -137.5t119 -348.5l-6 -86h-756q12 -164 112.5 -253t243.5 -89q164 0 299 115l9 6l82 -145q-16 -16 -49 -41t-137.5 -66t-215.5 -41q-313 0 -452 252h-5q-145 -252 -452 -252 q-231 0 -392 150.5t-161 390.5zM285 516q0 -164 102 -266.5t251.5 -102.5t253 103.5t103.5 271.5q0 162 -104.5 264.5t-251.5 102.5t-250.5 -103.5t-103.5 -269.5zM1206 639h553q-4 127 -73.5 195.5t-174.5 68.5q-119 0 -202 -69.5t-103 -194.5z" /> -<glyph unicode="Ÿ" horiz-adv-x="1204" d="M16 1446h230l268 -475l88 -183h4q43 100 88 183l264 475h230l-483 -834v-612h-203v612zM344 1599v207h164v-207h-164zM686 1599v207h164v-207h-164z" /> -<glyph unicode="ˆ" horiz-adv-x="1021" d="M227 1546l181 260h206l181 -260h-174l-109 164h-4l-107 -164h-174z" /> -<glyph unicode="˜" horiz-adv-x="1021" d="M166 1548q0 260 209 260q59 0 104 -34.5t82 -69.5t72 -35q41 0 60.5 40t19.5 93h143q0 -260 -209 -260q-59 0 -104 35t-82 69.5t-72 34.5q-80 0 -80 -133h-143z" /> -<glyph unicode="–" horiz-adv-x="1445" d="M184 504v160h1078v-160h-1078z" /> -<glyph unicode="—" horiz-adv-x="1855" d="M184 504v160h1487v-160h-1487z" /> -<glyph unicode="‘" horiz-adv-x="464" d="M100 1069l136 399h145l-88 -399h-193z" /> -<glyph unicode="’" horiz-adv-x="448" d="M104 1071l89 399h192l-133 -399h-148z" /> -<glyph unicode="‚" horiz-adv-x="499" d="M86 -184l88 399h186l-133 -399h-141z" /> -<glyph unicode="“" horiz-adv-x="755" d="M100 1069l136 399h147l-88 -399h-195zM389 1069l135 399h148l-88 -399h-195z" /> -<glyph unicode="”" horiz-adv-x="737" d="M104 1071l89 399h194l-135 -399h-148zM393 1071l88 399h195l-133 -399h-150z" /> -<glyph unicode="„" horiz-adv-x="784" d="M86 -184l88 399h186l-133 -399h-141zM369 -184l88 399h188l-133 -399h-143z" /> -<glyph unicode="•" horiz-adv-x="841" d="M104 596q0 133 93.5 225t224.5 92t223 -93t92 -224t-92 -224t-223 -93t-224.5 92t-93.5 225z" /> -<glyph unicode="…" horiz-adv-x="1576" d="M156 0v211h202v-211h-202zM686 0v211h205v-211h-205zM1219 0v211h202v-211h-202z" /> -<glyph unicode="‹" horiz-adv-x="727" d="M90 578l336 421h199l-336 -421l336 -420h-199z" /> -<glyph unicode="›" horiz-adv-x="727" d="M102 158l336 420l-336 421h199l336 -421l-336 -420h-199z" /> -<glyph unicode="€" horiz-adv-x="1210" d="M78 528v129h112q-8 82 0 148h-112v131h137q61 236 251.5 385t440.5 149q51 0 102.5 -6t77.5 -12l27 -6l-49 -186q-76 23 -162 22q-170 0 -296 -94t-177 -252h576l-27 -131h-578q-12 -68 -2 -148h553l-26 -129h-492q47 -162 177 -261t300 -99q45 0 92.5 6t69.5 14l25 7 l39 -185q-98 -35 -230 -35q-258 0 -447.5 153t-246.5 400h-135z" /> -<glyph unicode="™" horiz-adv-x="1925" d="M47 1309v137h778v-137h-311v-764h-156v764h-311zM891 545l72 901h141l213 -471l29 -86h4q12 49 26 86l213 471h144l69 -901h-153l-43 538l2 62h-4l-195 -434h-125l-194 434h-5l2 -62l-43 -538h-153z" /> -<glyph unicode="" horiz-adv-x="1035" d="M0 1035h1035v-1035h-1035v1035z" /> -<glyph unicode="fi" horiz-adv-x="1198" d="M82 877v159h129v35q0 98 28.5 171t69.5 113t98.5 63.5t101.5 30.5t91 7l76 -6v-170q-20 4 -51 4q-35 0 -67 -7t-68.5 -27.5t-59 -67.5t-22.5 -115v-31h634v-1036h-198v877h-436v-877h-197v877h-129zM842 1243v203h200v-203h-200z" /> -<glyph unicode="fl" horiz-adv-x="1230" d="M82 862v160h129v49q0 98 28.5 171t69.5 113t98.5 63.5t101.5 30.5t91 7l76 -6v-170q-20 4 -51 4q-35 0 -67 -7t-68.5 -27.5t-59 -67.5t-22.5 -115v-45h245v-160h-245v-862h-197v862h-129zM831 283v1163h199v-1129q0 -86 28.5 -116.5t82.5 -30.5l35 2v-176q-31 -4 -66 -4 q-279 0 -279 291z" /> -<glyph unicode="ffi" horiz-adv-x="1886" d="M82 877v159h129v35q0 98 28.5 171t69.5 113t98.5 63.5t101.5 30.5t91 7l76 -6v-170q-20 4 -51 4q-35 0 -67 -7t-68.5 -27.5t-59 -67.5t-22.5 -115v-31h491v35q0 98 28.5 171t69.5 113t98.5 63.5t101.5 30.5t91 7l76 -6v-170q-20 4 -51 4q-35 0 -67 -7t-68.5 -27.5 t-59 -67.5t-22.5 -115v-31h635v-1036h-199v877h-436v-877h-197v877h-491v-877h-197v877h-129zM1530 1243v203h201v-203h-201z" /> -<glyph unicode="ffl" horiz-adv-x="1918" d="M82 877v159h129v35q0 98 28.5 171t69.5 113t98.5 63.5t101.5 30.5t91 7l76 -6v-170q-20 4 -51 4q-35 0 -67 -7t-68.5 -27.5t-59 -67.5t-22.5 -115v-31h491v35q0 98 28.5 171t69.5 113t98.5 63.5t101.5 30.5t91 7l76 -6v-170q-20 4 -51 4q-35 0 -67 -7t-68.5 -27.5 t-59 -67.5t-22.5 -115v-31h245v-159h-245v-877h-197v877h-491v-877h-197v877h-129zM1520 283v1163h198v-1129q0 -86 29 -116.5t82 -30.5l35 2v-176q-31 -4 -66 -4q-278 0 -278 291z" /> -</font> -</defs></svg>
\ No newline at end of file diff --git a/web/cobrands/stevenage/fonts/MuseoSans_500-webfont.ttf b/web/cobrands/stevenage/fonts/MuseoSans_500-webfont.ttf Binary files differdeleted file mode 100755 index d23f991ce..000000000 --- a/web/cobrands/stevenage/fonts/MuseoSans_500-webfont.ttf +++ /dev/null diff --git a/web/cobrands/stevenage/fonts/MuseoSans_500-webfont.woff b/web/cobrands/stevenage/fonts/MuseoSans_500-webfont.woff Binary files differdeleted file mode 100755 index c1f85a061..000000000 --- a/web/cobrands/stevenage/fonts/MuseoSans_500-webfont.woff +++ /dev/null diff --git a/web/cobrands/stevenage/fonts/MuseoSans_500_Italic-webfont.eot b/web/cobrands/stevenage/fonts/MuseoSans_500_Italic-webfont.eot Binary files differdeleted file mode 100755 index e60c7e02e..000000000 --- a/web/cobrands/stevenage/fonts/MuseoSans_500_Italic-webfont.eot +++ /dev/null diff --git a/web/cobrands/stevenage/fonts/MuseoSans_500_Italic-webfont.svg b/web/cobrands/stevenage/fonts/MuseoSans_500_Italic-webfont.svg deleted file mode 100755 index 28df57c2f..000000000 --- a/web/cobrands/stevenage/fonts/MuseoSans_500_Italic-webfont.svg +++ /dev/null @@ -1,227 +0,0 @@ -<?xml version="1.0" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" > -<svg xmlns="http://www.w3.org/2000/svg"> -<metadata> -This is a custom SVG webfont generated by Fontspring. -</metadata> -<defs> -<font id="MuseoSans500Italic" horiz-adv-x="1073" > -<font-face units-per-em="2048" ascent="1536" descent="-512" /> -<missing-glyph horiz-adv-x="526" /> -<glyph unicode=" " horiz-adv-x="526" /> -<glyph unicode="	" horiz-adv-x="526" /> -<glyph unicode=" " horiz-adv-x="526" /> -<glyph unicode="!" horiz-adv-x="643" d="M100 0l41 201h205l-39 -201h-207zM190 397l191 1049h207l-219 -1049h-179z" /> -<glyph unicode=""" horiz-adv-x="694" d="M217 1085l74 385h155l-73 -385h-156zM504 1085l76 385h155l-76 -385h-155z" /> -<glyph unicode="#" horiz-adv-x="1462" d="M43 391l53 152h264l129 344h-262l56 149h260l151 410h170l-151 -410h319l152 410h170l-152 -410h262l-55 -149h-262l-129 -344h262l-55 -152h-262l-144 -391h-170l144 391h-318l-143 -391h-170l143 391h-262zM530 543h318l129 344h-318z" /> -<glyph unicode="$" horiz-adv-x="1159" d="M27 166l129 143q14 -16 40.5 -40.5t118 -64.5t191.5 -40q115 0 206 68.5t91 181.5q0 70 -60.5 124t-145.5 96t-171 90t-146.5 128t-60.5 186q0 168 135 291t330 139l37 189h143l-37 -193q201 -25 316 -135l6 -6l-115 -149q-12 12 -36.5 30.5t-103.5 48t-163 29.5 q-125 0 -216 -73.5t-91 -170.5q0 -63 60.5 -114.5t146.5 -93.5t171 -90t145.5 -132t60.5 -194q0 -172 -134.5 -299t-334.5 -138l-37 -186h-144l35 193q-221 31 -354 168z" /> -<glyph unicode="%" horiz-adv-x="1570" d="M25 0l1366 1446h202l-1366 -1446h-202zM199 1133q0 129 109.5 233t246.5 104q123 0 199.5 -75.5t76.5 -194.5q0 -131 -109.5 -233.5t-246.5 -102.5q-125 0 -200.5 74t-75.5 195zM360 1137q0 -53 35 -87t94 -34q72 0 126.5 53t54.5 127q0 55 -36 90t-93 35 q-70 0 -125.5 -55t-55.5 -129zM784 244q0 129 108.5 233.5t246.5 104.5q123 0 199.5 -76t76.5 -195q0 -131 -109.5 -233.5t-244.5 -102.5q-125 0 -201 74t-76 195zM944 248q0 -53 36 -87t95 -34q70 0 125 54.5t55 125.5q0 55 -35.5 90t-93.5 35q-70 0 -126 -56t-56 -128z " /> -<glyph unicode="&" horiz-adv-x="1394" d="M63 356q0 139 96.5 260t243.5 162v4q-6 2 -15 7.5t-33.5 25t-43 44t-34 70.5t-15.5 101q0 201 147.5 320.5t356.5 119.5q43 0 91 -7t73 -13l26 -8l-79 -156q-57 12 -107 12q-123 0 -214 -74.5t-91 -197.5q0 -176 227 -176h269l38 197h199l-37 -197h191l-35 -176h-191 l-39 -193q-100 -506 -565 -506q-215 0 -337 105.5t-122 275.5zM276 369q0 -92 67 -149.5t183 -57.5q299 0 365 327l37 185h-277q-154 0 -264.5 -79t-110.5 -226z" /> -<glyph unicode="'" horiz-adv-x="409" d="M217 1085l74 385h160l-76 -385h-158z" /> -<glyph unicode="(" horiz-adv-x="612" d="M131 354q0 655 424 1151h180q-426 -532 -426 -1155q0 -287 94 -545h-165q-107 268 -107 549z" /> -<glyph unicode=")" horiz-adv-x="614" d="M-109 -195q426 537 426 1156q0 287 -94 544h166q106 -264 107 -549q0 -651 -424 -1151h-181z" /> -<glyph unicode="*" horiz-adv-x="948" d="M160 1090l88 167l252 -102l41 291h186l-74 -291l295 102l25 -174l-301 -79l-2 -5l135 -221l-156 -106l-117 243h-4l-204 -241l-134 108l228 230v4z" /> -<glyph unicode="+" horiz-adv-x="1376" d="M127 504l31 160h456l101 503h168l-101 -503h457l-29 -160h-456l-99 -504h-168l99 504h-459z" /> -<glyph unicode="," horiz-adv-x="528" d="M-100 -207l209 422h210l-258 -422h-161z" /> -<glyph unicode="-" horiz-adv-x="956" d="M156 496l32 176h598l-32 -176h-598z" /> -<glyph unicode="." horiz-adv-x="512" d="M35 0l41 215h213l-41 -215h-213z" /> -<glyph unicode="/" horiz-adv-x="825" d="M-68 -86l832 1610h188l-833 -1610h-187z" /> -<glyph unicode="0" horiz-adv-x="1288" d="M123 453q0 119 20.5 248.5t69.5 269t122 249t188.5 180t256.5 70.5q428 0 428 -477q0 -119 -20.5 -249t-69.5 -269t-121.5 -248.5t-188.5 -180.5t-259 -71q-426 1 -426 478zM332 457q0 -295 225 -295q92 0 169 58.5t126 148.5t83 202.5t48 217t14 196.5q0 299 -223 299 q-111 0 -200 -83t-139 -213t-76.5 -267t-26.5 -264z" /> -<glyph unicode="1" horiz-adv-x="995" d="M2 0l31 176h319l180 918l19 88h-4q-23 -33 -84 -84l-158 -129l-106 139l417 338h183l-248 -1270h313l-33 -176h-829z" /> -<glyph unicode="2" horiz-adv-x="1171" d="M10 0q2 129 52.5 237.5t130 185.5t176 143.5t192.5 125t175 115.5t128 129t49 151q0 88 -59 140.5t-158 52.5q-55 0 -109.5 -19.5t-92 -46t-68.5 -53t-45 -47.5l-16 -18l-144 112q8 10 22.5 27.5t64.5 64t104.5 80t137.5 62t169 28.5q184 0 297.5 -99t113.5 -263 q0 -139 -81.5 -255t-201.5 -197t-243 -151.5t-220 -154.5t-118 -174h707l-33 -176h-930z" /> -<glyph unicode="3" horiz-adv-x="1159" d="M-8 172l127 141q4 -6 12 -15t40 -34.5t66.5 -45t94 -35t123.5 -15.5q137 0 243.5 92t106.5 223q0 106 -82 160.5t-211 54.5h-104l-25 109l379 371l108 94v4q-43 -6 -122 -6h-478l35 176h864l-26 -129l-477 -459q57 -6 113.5 -27.5t110.5 -62.5t88 -112.5t34 -163.5 q0 -207 -160 -362t-393 -155q-92 0 -173 20.5t-132.5 49.5t-90 57.5t-55.5 49.5z" /> -<glyph unicode="4" horiz-adv-x="1243" d="M20 387l25 127l832 932h249l-174 -887h197l-33 -172h-196l-76 -387h-199l74 387h-699zM295 559h459l102 526l35 144h-4q-47 -66 -94 -119l-498 -549v-2z" /> -<glyph unicode="5" horiz-adv-x="1159" d="M16 176l131 137q4 -6 11.5 -15t35 -34.5t59.5 -45t85 -35t113 -15.5q143 0 258.5 101.5t115.5 248.5q0 106 -76.5 173t-201.5 67q-66 0 -130.5 -18.5t-97.5 -34.5l-30 -19l-115 45l213 715h735l-35 -176h-555l-92 -301l-24 -76h4q82 41 186 41q188 0 309 -114.5 t121 -291.5q0 -229 -175 -391t-408 -162q-264 0 -408 164z" /> -<glyph unicode="6" horiz-adv-x="1228" d="M113 504q0 143 54 307t150.5 313.5t253 247.5t340.5 98q84 0 158 -15t107 -30l30 -16l-92 -166q-86 41 -201 41q-186 0 -325 -142.5t-205 -342.5h4q55 61 145.5 99t178.5 38q184 0 289.5 -109.5t105.5 -287.5q0 -215 -149.5 -389.5t-381.5 -174.5q-211 0 -336.5 142.5 t-125.5 386.5zM317 485q0 -131 71 -227t185 -96q139 0 234.5 108.5t95.5 261.5q0 106 -64.5 169t-183.5 63q-121 0 -229.5 -81t-108.5 -198z" /> -<glyph unicode="7" horiz-adv-x="1085" d="M39 0l784 1139q59 84 111 133v4q-33 -6 -105 -6h-632l34 176h967l-27 -139l-907 -1307h-225z" /> -<glyph unicode="8" horiz-adv-x="1249" d="M76 369q0 86 40 166.5t102.5 139t100 88.5t70.5 48q-123 102 -123 240q0 166 138.5 292.5t363.5 126.5q195 0 306.5 -90t111.5 -250q0 -72 -32 -147.5t-81 -136t-80.5 -93t-58.5 -55.5q154 -106 153 -260q0 -188 -160.5 -325.5t-391.5 -137.5q-209 0 -334 107t-125 287z M289 379q0 -100 71.5 -160.5t178.5 -60.5q133 0 236.5 77.5t103.5 200.5q0 39 -17.5 71t-60.5 63.5t-72 48t-100 52.5l-97 48q-33 -18 -67.5 -45t-77.5 -71t-70.5 -102.5t-27.5 -121.5zM471 1053q0 -29 9 -54.5t30.5 -49t39 -40t54.5 -37t56.5 -31t64.5 -32t61 -29.5 q193 166 193 336q0 80 -58.5 126t-160.5 46q-127 0 -208 -68.5t-81 -166.5z" /> -<glyph unicode="9" horiz-adv-x="1230" d="M66 37l92 166q88 -41 202 -41q186 0 324.5 142t204.5 343h-4q-45 -55 -135.5 -95t-186.5 -40q-186 0 -290.5 108.5t-104.5 286.5q0 215 150.5 389t381.5 174q211 0 336 -142t125 -386q0 -113 -32.5 -242t-101.5 -257t-161 -232.5t-224 -170t-280 -65.5q-185 1 -296 62z M369 913q0 -104 64.5 -167.5t180.5 -63.5q121 0 230.5 82t109.5 199q0 131 -69.5 226t-186.5 95q-139 0 -234 -108.5t-95 -262.5z" /> -<glyph unicode=":" horiz-adv-x="595" d="M72 0l41 215h215l-43 -215h-213zM231 821l43 215h213l-41 -215h-215z" /> -<glyph unicode=";" horiz-adv-x="606" d="M-74 -207l209 422h211l-256 -422h-164zM252 821l41 215h209l-41 -215h-209z" /> -<glyph unicode="<" horiz-adv-x="1171" d="M59 516v135l955 426v-182l-733 -309v-4l733 -310v-182z" /> -<glyph unicode="=" horiz-adv-x="1376" d="M190 309v160h977v-160h-977zM190 696v160h977v-160h-977z" /> -<glyph unicode=">" horiz-adv-x="1165" d="M141 90v182l731 310v4l-731 309v182l955 -426v-135z" /> -<glyph unicode="?" horiz-adv-x="989" d="M168 0l41 201h205l-39 -201h-207zM199 1356q18 12 51 32.5t128 53.5t185 33q166 0 273.5 -89.5t107.5 -238.5q0 -100 -45 -184t-111.5 -140.5t-135 -105.5t-124 -109.5t-67.5 -126.5l-19 -84h-192l18 97q18 90 72.5 165.5t119 126t127 99.5t104.5 108.5t42 128.5 q0 74 -53 120t-143 46q-131 -2 -250 -86z" /> -<glyph unicode="@" horiz-adv-x="1658" d="M84 358q0 176 73.5 341t195.5 286t285 193.5t333 72.5q252 0 364.5 -95t112.5 -255q0 -49 -12 -110l-103 -535h146l-29 -150h-537q-174 0 -275 95.5t-101 240.5q0 170 140 302.5t343 132.5h242q4 20 4 32q0 80 -77 129t-216 49q-274 0 -482 -220t-208 -498 q0 -205 129 -336t352 -131l-31 -158q-283 0 -466 174t-183 440zM737 446q0 -84 54.5 -137t144.5 -53h205l94 483h-201q-121 0 -209 -88t-88 -205z" /> -<glyph unicode="A" horiz-adv-x="1282" d="M-98 0l792 1446h226l235 -1446h-203l-63 416h-545l-225 -416h-217zM428 584h440l-71 458l-21 205h-4q-55 -131 -94 -205z" /> -<glyph unicode="B" horiz-adv-x="1302" d="M78 0l282 1446h465q125 0 197 -27q92 -35 143.5 -109.5t51.5 -179.5q0 -123 -67 -221t-177 -145v-4q84 -31 131 -106.5t47 -178.5q0 -156 -84 -270.5t-221 -167.5q-94 -37 -213 -37h-555zM315 176h326q78 0 135 29q76 37 121 109.5t45 164.5q0 88 -54 139.5t-153 51.5 h-323zM442 838h306q111 0 186.5 77.5t75.5 192.5q0 76 -46 119t-135 43h-301z" /> -<glyph unicode="C" horiz-adv-x="1480" d="M111 602q0 231 118.5 433t316 318.5t421.5 116.5q102 0 193 -19t148.5 -48t100.5 -57.5t61 -47.5l19 -20l-121 -139q-16 16 -47 40.5t-133.5 64.5t-214.5 40q-270 0 -462 -201.5t-192 -470.5q0 -197 118 -323.5t323 -126.5q236 0 452 164l29 22l88 -160q-10 -8 -28.5 -22 t-78 -51t-123 -66t-159.5 -51.5t-190 -22.5q-293 0 -466 174t-173 453z" /> -<glyph unicode="D" horiz-adv-x="1513" d="M80 0l280 1446h447q299 0 469 -147.5t170 -415.5q0 -242 -107.5 -442.5t-304 -320.5t-442.5 -120h-512zM315 176h263q289 0 475 197.5t186 492.5q0 195 -119 299.5t-327 104.5h-265z" /> -<glyph unicode="E" horiz-adv-x="1171" d="M78 0l284 1446h838l-35 -176h-637l-88 -453h518l-34 -176h-518l-91 -465h672l-33 -176h-876z" /> -<glyph unicode="F" horiz-adv-x="1069" d="M78 0l282 1446h795l-35 -176h-594l-92 -475h504l-33 -177h-506l-120 -618h-201z" /> -<glyph unicode="G" horiz-adv-x="1556" d="M111 590q0 358 258 619t610 261q299 0 489 -147l29 -25l-123 -141q-6 6 -17 14.5t-49 30t-80 38.5t-108.5 30.5t-136.5 13.5q-281 0 -471 -205t-190 -479q0 -201 119.5 -319.5t312.5 -118.5q219 0 422 168l26 22l39 199h-233l32 176h420l-141 -727h-176l16 90l15 62h-5 q-6 -6 -19 -18.5t-58 -43.5t-94.5 -53.5t-125 -42t-153.5 -19.5q-260 0 -434 170.5t-174 444.5z" /> -<glyph unicode="H" horiz-adv-x="1546" d="M78 0l282 1446h201l-125 -637h752l125 637h200l-282 -1446h-201l123 635h-752l-122 -635h-201z" /> -<glyph unicode="I" horiz-adv-x="595" d="M78 0l282 1446h201l-280 -1446h-203z" /> -<glyph unicode="J" horiz-adv-x="1089" d="M10 317q0 55 10 107l13 63h200l-10 -59q-8 -53 -8 -82q0 -184 182 -184q94 0 171 62.5t104 193.5l166 852h-363l35 176h563l-203 -1047q-29 -145 -105.5 -243.5t-169.5 -139.5t-202 -41q-164 0 -273.5 87t-109.5 255z" /> -<glyph unicode="K" horiz-adv-x="1275" d="M78 0l282 1446h201l-119 -608h207l492 608h235l-565 -694v-4l299 -748h-215l-258 664h-229l-129 -664h-201z" /> -<glyph unicode="L" horiz-adv-x="1071" d="M78 0l282 1446h203l-248 -1270h648l-37 -176h-848z" /> -<glyph unicode="M" horiz-adv-x="1771" d="M31 0l395 1446h211l180 -782l33 -195h4q61 113 111 195l485 782h217l-166 -1446h-198l108 911q10 88 37 213h-4q-70 -135 -119 -213l-414 -651h-182l-162 651l-37 217h-4q-18 -129 -43 -217l-250 -911h-202z" /> -<glyph unicode="N" horiz-adv-x="1536" d="M78 0l282 1446h187l463 -940q37 -76 77 -209h5q10 129 26 209l182 940h203l-282 -1446h-187l-463 938q-39 80 -79 211h-5q-10 -129 -26 -211l-182 -938h-201z" /> -<glyph unicode="O" horiz-adv-x="1677" d="M109 606q0 227 122.5 429t322.5 318.5t417 116.5q289 0 467 -172t178 -442q0 -231 -125 -437t-324.5 -325t-414.5 -119q-289 0 -466 177.5t-177 453.5zM315 614q0 -201 123 -326.5t316 -125.5q250 0 451.5 203.5t201.5 480.5q0 195 -122 316.5t-316 121.5 q-252 0 -453 -199t-201 -471z" /> -<glyph unicode="P" horiz-adv-x="1245" d="M78 0l282 1446h496q137 0 225 -47q86 -45 134.5 -129t48.5 -193q0 -170 -87 -304t-229 -195q-100 -43 -215 -43h-348l-104 -535h-203zM418 711h295q88 0 153 32q86 41 137.5 125t51.5 195q0 98 -60.5 152.5t-173.5 54.5h-293z" /> -<glyph unicode="Q" horiz-adv-x="1699" d="M109 606q0 227 122.5 429t322.5 318.5t417 116.5q287 0 465 -172t178 -442q0 -350 -268 -614l133 -160l-129 -119l-136 170q-209 -158 -462 -158q-289 0 -466 177.5t-177 453.5zM315 614q0 -201 122 -326.5t317 -125.5q178 0 342 114l-140 170l129 119l138 -174 q182 199 182 455q0 195 -122 316.5t-314 121.5q-252 0 -453 -199t-201 -471z" /> -<glyph unicode="R" horiz-adv-x="1306" d="M78 0l282 1446h492q125 0 205 -37q184 -86 184 -303q0 -164 -94 -298t-254 -179v-4q10 -20 27 -66l200 -559h-215l-198 575h-316l-110 -575h-203zM426 752h285q135 0 228 90t93 235q0 90 -57 141.5t-158 51.5h-291z" /> -<glyph unicode="S" horiz-adv-x="1120" d="M6 166l127 143q4 -6 14.5 -15t44 -35t71.5 -45t98.5 -34.5t123.5 -15.5q115 0 205 68.5t90 181.5q0 70 -60.5 124t-145.5 96t-170 90t-145 128t-60 186q0 180 151.5 306t362.5 126q127 0 230.5 -36.5t143.5 -73.5l41 -37l-114 -149q-12 12 -37 30.5t-103.5 48 t-162.5 29.5q-125 0 -217.5 -73.5t-92.5 -170.5q0 -63 60.5 -114.5t146.5 -93.5t172 -90t146.5 -132t60.5 -194q0 -178 -145.5 -308.5t-360.5 -130.5q-272 0 -444 160z" /> -<glyph unicode="T" horiz-adv-x="1206" d="M131 1270l33 176h1194l-33 -176h-498l-245 -1270h-203l248 1270h-496z" /> -<glyph unicode="U" horiz-adv-x="1488" d="M147 403q0 55 13 117l180 926h201l-181 -932q-8 -39 -8 -86q0 -127 80 -196.5t225 -69.5q168 0 285 94t150 262l182 928h201l-185 -944q-47 -242 -219 -384.5t-418 -142.5q-225 0 -365.5 113.5t-140.5 314.5z" /> -<glyph unicode="V" horiz-adv-x="1290" d="M166 1446h211l160 -1022q12 -78 16 -199h4q53 121 94 199l559 1022h228l-809 -1446h-217z" /> -<glyph unicode="W" horiz-adv-x="1951" d="M225 1446h207l53 -1061v-154h4q27 74 64 154l500 1061h184l63 -1061v-154h5q27 78 59 154l461 1061h221l-651 -1446h-238l-63 938v205h-4q-43 -111 -86 -203l-449 -940h-233z" /> -<glyph unicode="X" horiz-adv-x="1239" d="M-74 0l598 754l-291 692h220l153 -385l62 -172h4q55 88 119 168l303 389h239l-571 -709l317 -737h-215l-182 438l-59 166h-5q-55 -82 -116 -162l-346 -442h-230z" /> -<glyph unicode="Y" horiz-adv-x="1185" d="M164 1446h217l174 -475q29 -80 53 -183h4q61 98 123 181l355 477h243l-651 -840l-119 -606h-201l121 612z" /> -<glyph unicode="Z" horiz-adv-x="1232" d="M-37 0l27 135l874 1004q33 37 66 69l49 49l16 15v4q-37 -6 -106 -6h-643l35 176h1013l-26 -133l-877 -1006q-33 -37 -65.5 -69.5t-49.5 -47.5l-16 -14v-4q37 4 107 4h686l-33 -176h-1057z" /> -<glyph unicode="[" horiz-adv-x="612" d="M43 -195l332 1700h340l-31 -149h-166l-270 -1399h166l-31 -152h-340z" /> -<glyph unicode="\" horiz-adv-x="806" d="M229 1524h168l207 -1610h-168z" /> -<glyph unicode="]" horiz-adv-x="602" d="M-94 -195l31 152h163l271 1399h-164l29 149h339l-329 -1700h-340z" /> -<glyph unicode="^" horiz-adv-x="1255" d="M23 506l409 940h129l408 -940h-178l-295 721l-293 -721h-180z" /> -<glyph unicode="_" horiz-adv-x="1204" d="M-96 -160l28 160h1102l-30 -160h-1100z" /> -<glyph unicode="`" horiz-adv-x="1021" d="M248 1806h205l96 -260h-158z" /> -<glyph unicode="a" d="M0 238q0 119 66.5 204.5t176 127.5t219 59.5t228.5 17.5h51q8 41 9 84q0 162 -187 162q-72 0 -148.5 -24.5t-119.5 -49.5l-41 -24l-53 157q18 12 53 30.5t137.5 48.5t200.5 30q162 0 261 -75t99 -232q0 -57 -12 -115l-125 -639h-184l20 104q14 82 23 82h-4 q2 0 -13.5 -21.5t-46 -52t-71.5 -62.5t-102.5 -53.5t-127.5 -21.5q-129 0 -219 71t-90 192zM203 270q0 -57 42 -96t124 -39q117 0 213 101.5t127 226.5l8 35h-51q-463 -1 -463 -228z" /> -<glyph unicode="b" horiz-adv-x="1226" d="M35 0l280 1446h199l-90 -469l-27 -94h4q55 80 149.5 129t194.5 49q184 0 287 -115t103 -311q0 -285 -171 -472.5t-397 -187.5q-109 0 -193.5 49.5t-121.5 139.5h-4q0 -39 -8 -84l-17 -80h-188zM317 410q0 -115 58.5 -189t173.5 -74q145 0 264 131.5t119 342.5 q0 125 -62.5 195.5t-171.5 70.5q-158 0 -269.5 -143.5t-111.5 -333.5z" /> -<glyph unicode="c" horiz-adv-x="1118" d="M53 426q0 262 190.5 448.5t448.5 186.5q236 0 373 -131l18 -19l-110 -129q-10 12 -31.5 29.5t-92.5 47.5t-147 30q-178 0 -312 -132t-134 -317q0 -131 83 -212t220 -81q86 0 173 35t132 70l43 35l56 -158q-18 -16 -53.5 -42t-146 -69t-222.5 -43q-223 0 -355.5 125 t-132.5 326z" /> -<glyph unicode="d" horiz-adv-x="1228" d="M55 399q0 287 171 474.5t403 187.5q100 0 184 -44t119 -130h4q0 39 8 76l94 483h199l-281 -1446h-190l20 98l19 76h-4q-57 -86 -149.5 -142.5t-205.5 -56.5q-184 0 -287.5 113.5t-103.5 310.5zM258 414q0 -125 63.5 -196t172.5 -71q158 0 268 146.5t110 331.5 q0 115 -58 188.5t-173 73.5q-145 0 -264 -131t-119 -342z" /> -<glyph unicode="e" horiz-adv-x="1128" d="M55 418q0 262 173 452.5t429 190.5q195 0 295.5 -104.5t100.5 -278.5q0 -37 -8.5 -84t-16.5 -76l-8 -29h-756q-6 -31 -6 -61q0 -121 78 -201t217 -80q80 0 162 31t125 60l43 30l57 -157q-18 -14 -53 -37t-139.5 -61t-202.5 -38q-223 0 -356.5 123t-133.5 320zM297 639 h553q4 23 4 55q0 100 -55.5 154.5t-145.5 54.5q-115 0 -212 -71.5t-144 -192.5z" /> -<glyph unicode="f" horiz-adv-x="686" d="M92 0l168 864h-129l31 162h129l10 49q18 96 60 169t89.5 112t107.5 63.5t104.5 30.5t87.5 6l90 -6l-37 -170q-16 4 -47 4q-217 0 -258 -217l-9 -41h244l-31 -162h-243l-168 -864h-199z" /> -<glyph unicode="g" horiz-adv-x="1210" d="M-2 -338l86 148q113 -68 276 -68q145 0 250 71.5t133 219.5l17 76l18 71h-2q-123 -168 -319 -168q-186 0 -291 116t-105 304q0 150 61.5 291t189.5 239.5t296 98.5q248 0 316 -164h4q0 23 4 43l18 96h189l-195 -1007q-47 -238 -206.5 -348.5t-366.5 -110.5t-373 92z M264 446q0 -123 62.5 -192.5t179.5 -69.5q166 0 261 151.5t95 330.5q0 223 -237 223q-164 0 -262.5 -133.5t-98.5 -309.5z" /> -<glyph unicode="h" horiz-adv-x="1230" d="M35 0l280 1446h199l-102 -531l-23 -92h4q49 88 164 163t254 75q143 0 224 -68.5t81 -206.5q0 -55 -16 -131l-127 -655h-199l119 612q14 76 14 117q0 150 -153 150q-152 0 -275 -120t-153 -286l-93 -473h-198z" /> -<glyph unicode="i" horiz-adv-x="507" d="M35 0l203 1036h198l-203 -1036h-198zM274 1243l39 203h205l-41 -203h-203z" /> -<glyph unicode="j" horiz-adv-x="507" d="M-311 -418l32 170q18 -2 46 -2q35 0 68.5 8.5t76.5 28.5t74.5 69.5t46.5 120.5l205 1059h198l-209 -1069q-18 -98 -60 -173t-88 -114.5t-105.5 -64.5t-102.5 -31t-88 -6zM274 1243l39 203h205l-39 -203h-205z" /> -<glyph unicode="k" d="M35 0l282 1446h199l-156 -789h142l358 379h240l-443 -465v-4l269 -567h-215l-219 485h-164l-95 -485h-198z" /> -<glyph unicode="l" horiz-adv-x="540" d="M72 209q0 33 10 88l223 1149h199l-215 -1114q-10 -47 -10 -78q0 -84 92 -84l32 2l-36 -176q-29 -4 -60 -4q-98 0 -166.5 49t-68.5 168z" /> -<glyph unicode="m" horiz-adv-x="1867" d="M37 0l201 1036h194l-26 -133l-25 -86h4q57 100 167 172t230 72q250 0 273 -236h4q61 100 171.5 168t231.5 68q141 0 216 -68.5t75 -206.5q0 -57 -16 -139l-125 -647h-199l121 616q12 68 12 113q0 152 -147 152q-137 0 -244.5 -124t-138.5 -284l-92 -473h-197l119 616 q12 68 12 117q0 147 -143 148q-135 0 -246 -124t-141 -286l-92 -471h-199z" /> -<glyph unicode="n" horiz-adv-x="1232" d="M37 0l201 1036h194l-22 -121l-29 -98h4q49 90 168 167t260 77q143 0 223 -68.5t80 -206.5q0 -49 -14 -131l-127 -655h-199l119 612q14 76 14 117q0 150 -153.5 150t-275.5 -119t-154 -287l-90 -473h-199z" /> -<glyph unicode="o" horiz-adv-x="1273" d="M53 432q0 260 195.5 444.5t445.5 184.5q217 0 354.5 -126t137.5 -327q0 -262 -195.5 -447.5t-443.5 -185.5q-219 0 -356.5 127t-137.5 330zM256 440q0 -131 82 -212t211 -81q166 0 300 132.5t134 318.5q0 129 -82 210t-209 81q-170 0 -303 -131.5t-133 -317.5z" /> -<glyph unicode="p" horiz-adv-x="1226" d="M-43 -410l281 1446h184l-16 -88l-23 -82h4q57 86 150.5 140.5t210.5 54.5q184 0 286.5 -115t102.5 -311q0 -285 -170 -472.5t-394 -187.5q-106 0 -189 46.5t-120 134.5h-4q-4 -43 -14 -97l-90 -469h-199zM319 414q0 -117 59.5 -192t172.5 -75q145 0 264 131.5t119 342.5 q0 125 -62.5 195.5t-171.5 70.5q-156 0 -268.5 -144.5t-112.5 -328.5z" /> -<glyph unicode="q" horiz-adv-x="1228" d="M55 397q0 287 171 475.5t403 188.5q233 0 309 -180h4q2 31 10 71l15 84h190l-280 -1446h-199l90 473l27 97h-4q-49 -76 -139.5 -130.5t-207.5 -54.5q-184 0 -286.5 113.5t-102.5 308.5zM258 414q0 -125 63.5 -196t172.5 -71q158 0 268 146.5t110 331.5q0 115 -58 188.5 t-173 73.5q-145 0 -264 -131t-119 -342z" /> -<glyph unicode="r" horiz-adv-x="765" d="M37 0l201 1036h192l-37 -180l-20 -84h2q55 117 156.5 197t218.5 80q37 0 61 -5l-39 -196q-23 6 -55 6q-137 0 -255 -144.5t-155 -332.5l-71 -377h-199z" /> -<glyph unicode="s" horiz-adv-x="909" d="M-23 125l109 131q12 -12 33.5 -30.5t96.5 -50.5t157 -32q80 0 144.5 41t64.5 113q0 43 -47.5 77t-114 62.5t-133 63.5t-113.5 96t-47 145q0 145 120 232.5t277 87.5q205 0 330 -107l8 -8l-98 -137q-8 10 -25.5 23.5t-80 37t-136.5 23.5q-78 0 -142.5 -38t-64.5 -112 q0 -43 47.5 -76.5t115 -62.5t134 -63.5t113.5 -97t47 -146.5q0 -141 -115.5 -231.5t-283.5 -90.5q-72 0 -139.5 15.5t-111.5 37t-78 44t-50 39.5z" /> -<glyph unicode="t" horiz-adv-x="722" d="M111 864l30 162h140l59 295h192l-59 -295h250l-31 -162h-250l-86 -452q-8 -41 -8 -82q0 -162 170 -162l60 4l-35 -176q-33 -4 -66 -4q-334 0 -334 303q0 45 13 104l90 465h-135z" /> -<glyph unicode="u" horiz-adv-x="1220" d="M80 250q0 49 14 131l127 655h199l-119 -610q-12 -68 -12 -119q0 -72 35.5 -109.5t119.5 -37.5q150 0 266.5 123t147.5 282l92 471h199l-201 -1036h-194l24 121l27 98h-4q-53 -92 -166 -168t-254 -76q-133 0 -217 67t-84 208z" /> -<glyph unicode="v" horiz-adv-x="1009" d="M86 1036h197l112 -704l11 -142h4q35 84 65 142l387 704h213l-586 -1036h-219z" /> -<glyph unicode="w" horiz-adv-x="1658" d="M115 1036h198l74 -731l4 -110h4q25 59 49 110l365 729h184l80 -729l6 -110h4q20 57 47 110l361 731h213l-535 -1036h-219l-86 670l-6 110h-4q-25 -57 -51 -110l-342 -670h-215z" /> -<glyph unicode="x" horiz-adv-x="1032" d="M-76 0l465 539l-250 497h213l144 -309l22 -65h4q23 35 43 61l254 313h236l-439 -512l261 -524h-209l-160 340l-25 61h-4q-18 -33 -39 -57l-282 -344h-234z" /> -<glyph unicode="y" horiz-adv-x="1042" d="M-188 -362l92 141q43 -37 112 -37q129 0 220 149l75 123l-237 1022h207l139 -700l16 -123h2q31 68 60 119l389 704h223l-727 -1226q-143 -240 -358 -240q-125 0 -213 68z" /> -<glyph unicode="z" horiz-adv-x="1046" d="M-41 0l21 115l641 655l102 96v4q-31 -4 -98 -4h-478l33 170h852l-20 -114l-643 -658l-105 -94v-4q33 4 101 4h516l-33 -170h-889z" /> -<glyph unicode="{" horiz-adv-x="714" d="M90 578l35 176q6 0 18.5 2t45 16t60 36.5t54.5 68t39 104.5l37 184q68 344 399 344q10 0 21.5 -1t17.5 -1h8l-30 -151h-27q-176 0 -219 -215l-45 -226q-33 -170 -185 -235l-32 -12v-4l13 -6.5t29.5 -22t37 -40t30 -60t13.5 -82.5q0 -27 -7 -60l-45 -223q-8 -41 -8 -72 q0 -143 146 -143h28l-30 -152q-20 -4 -50 -4q-27 0 -55.5 5.5t-69 21.5t-71.5 44t-52.5 78t-21.5 118q0 49 12 104l35 184q6 35 6 60q0 127 -114 159z" /> -<glyph unicode="|" horiz-adv-x="651" d="M244 -326v1948h174v-1948h-174z" /> -<glyph unicode="}" horiz-adv-x="706" d="M-100 -197l28 152h27q180 0 221 215l47 244q12 59 39 107t56.5 74t57 43t46.5 24l18 6v4q-14 6 -33.5 18t-53.5 64.5t-34 122.5q0 29 7 61l39 203q8 35 8 71q0 143 -146 144h-26l28 151q23 4 49.5 4t55 -5t69.5 -21.5t72 -44t53.5 -77.5t22.5 -118q0 -31 -12 -104 l-31 -164q-6 -35 -6 -59q0 -68 33.5 -109t66.5 -47l35 -8l-33 -176q-8 0 -20.5 -2.5t-45 -16.5t-59 -36.5t-54.5 -67.5t-40 -105l-39 -205q-66 -346 -401 -346z" /> -<glyph unicode="~" horiz-adv-x="1210" d="M113 418q0 174 74.5 260t211.5 86q72 0 130.5 -32t89 -68.5t75.5 -68.5t97 -32q74 0 105.5 57.5t31.5 135.5h162q0 -346 -285 -346q-72 0 -130.5 30.5t-89 68.5t-76.5 68.5t-97 30.5q-72 0 -105 -57t-33 -133h-161z" /> -<glyph unicode="¡" horiz-adv-x="585" d="M-8 -410l219 1049h178l-190 -1049h-207zM231 836l41 200h207l-41 -200h-207z" /> -<glyph unicode="¢" horiz-adv-x="1181" d="M117 602q0 172 73.5 327.5t202.5 256t283 114.5l33 170h145l-35 -178q78 -14 139.5 -51t93 -80t53 -85t28.5 -68l6 -27l-181 -68q-2 8 -5 21.5t-19 48.5t-40 61.5t-70 48t-105 21.5q-170 0 -283.5 -150.5t-113.5 -361.5q0 -125 62 -196.5t183 -71.5q90 0 170 50t115 99 l33 49l176 -73q-6 -12 -18.5 -31.5t-56.5 -71t-94 -92.5t-130 -76.5t-166 -42.5l-33 -172h-145l35 181q-154 31 -245 148.5t-91 299.5z" /> -<glyph unicode="£" horiz-adv-x="1193" d="M-6 0l35 176h121l92 477h-90l28 144h90l58 293q31 164 169 272t320 108q197 0 328 -124l12 -15l-133 -127q-8 8 -25.5 22.5t-73 37t-112.5 22.5q-111 0 -188.5 -62.5t-96.5 -156.5l-53 -270h379l-29 -144h-379l-92 -477h668l-35 -176h-993z" /> -<glyph unicode="¥" horiz-adv-x="1239" d="M139 408l25 129h334l16 75l-37 99h-278l24 129h211l-221 606h221l154 -451q33 -94 55 -209h4q57 113 125 207l328 453h241l-456 -606h209l-27 -129h-276l-72 -99l-17 -75h332l-24 -129h-332l-80 -408h-205l80 408h-334z" /> -<glyph unicode="§" horiz-adv-x="894" d="M-23 -16l109 120q70 -63 186 -63q123 0 191.5 80t71.5 207l14 788h162l-15 -797q-4 -186 -116.5 -316t-309.5 -130q-170 0 -286 104zM207 227l14 799q4 186 116 315t310 129q170 0 287 -104l6 -6l-109 -119q-70 63 -184 64q-125 0 -193.5 -81t-70.5 -208l-14 -789h-162z " /> -<glyph unicode="¨" horiz-adv-x="1021" d="M131 1599l41 207h164l-41 -207h-164zM475 1599l39 207h164l-41 -207h-162z" /> -<glyph unicode="©" horiz-adv-x="1697" d="M137 723q0 311 212 529t515 218q305 0 519 -218t214 -529t-214 -529.5t-519 -218.5q-303 0 -515 218.5t-212 529.5zM287 723q0 -256 167 -432t410 -176q248 0 416 176t168 432t-168 432t-416 176q-244 0 -410.5 -176t-166.5 -432zM475 721q0 168 111.5 288.5t292.5 120.5 q195 0 311 -165l22 -37l-125 -68q-8 14 -23 36t-67.5 57.5t-111.5 35.5q-117 0 -185.5 -79t-68.5 -189q0 -115 67.5 -191.5t186.5 -76.5q59 0 110.5 32.5t71.5 63.5l20 33l125 -68q-4 -8 -12 -21.5t-37.5 -49t-64.5 -62.5t-94.5 -48.5t-124.5 -21.5q-180 0 -292 120 t-112 290z" /> -<glyph unicode="ª" horiz-adv-x="856" d="M131 543l23 116h563l-25 -116h-561zM213 956q0 250 420 250h35q6 35 6 51q0 90 -109 91q-41 0 -87 -14.5t-72 -26.5l-25 -15l-41 105q106 70 258 69q223 0 223 -198q0 -39 -10 -86l-76 -385h-139l18 94h-4q-8 -12 -24.5 -30.5t-69.5 -48.5t-113 -30q-76 0 -133 46 t-57 128zM367 973q0 -31 22.5 -50.5t65.5 -19.5q66 0 121 60.5t67 119.5l4 19h-24q-256 0 -256 -129z" /> -<glyph unicode="«" horiz-adv-x="1134" d="M76 582l391 417h209l-410 -430l262 -411h-188zM483 582l424 417h213l-446 -430l262 -411h-188z" /> -<glyph unicode="¬" horiz-adv-x="1290" d="M143 696v160h977v-547h-166v387h-811z" /> -<glyph unicode="­" horiz-adv-x="882" d="M6 496l33 176h598l-33 -176h-598z" /> -<glyph unicode="®" horiz-adv-x="1697" d="M137 723q0 311 212 529t515 218q305 0 519 -218t214 -529t-214 -529.5t-519 -218.5q-303 0 -515 218.5t-212 529.5zM287 723q0 -256 167 -432t410 -176q248 0 416 176t168 432t-168 432t-416 176q-244 0 -410.5 -176t-166.5 -432zM614 340v772h297q111 0 177.5 -64.5 t66.5 -170.5q0 -82 -43 -136.5t-98 -68.5v-4q8 -8 26 -43l148 -285h-160l-143 299h-125v-299h-146zM760 745h123q57 0 91 35t34 97q0 59 -34 91.5t-91 32.5h-123v-256z" /> -<glyph unicode="¯" horiz-adv-x="1021" d="M131 1606l27 143h520l-27 -143h-520z" /> -<glyph unicode="°" horiz-adv-x="792" d="M186 1130q0 133 107.5 236.5t241.5 103.5q123 0 201.5 -75.5t78.5 -190.5q0 -135 -108.5 -237.5t-239.5 -102.5q-123 0 -202 74.5t-79 191.5zM346 1139q0 -55 35 -89t94 -34q70 0 125 53t55 125q0 55 -35.5 91t-93.5 36q-72 0 -126 -55t-54 -127z" /> -<glyph unicode="±" horiz-adv-x="1433" d="M145 504v160h459v503h168v-503h457v-160h-457v-504h-168v504h-459zM178 -195h1018v-159h-1018v159z" /> -<glyph unicode="²" horiz-adv-x="796" d="M-8 866q2 119 60.5 209t139 143.5t161.5 98.5t137.5 99t56.5 118q0 47 -34 76.5t-89 29.5q-45 0 -93 -24.5t-73 -48.5l-27 -25l-90 100q14 16 40 39t102.5 62t150.5 39q121 0 197 -64.5t76 -171.5q0 -88 -48.5 -157.5t-119 -115.5t-143 -85t-133 -86t-77.5 -101h430 l-26 -135h-598z" /> -<glyph unicode="³" horiz-adv-x="796" d="M8 981l96 100q8 -10 23.5 -25.5t71 -42t116.5 -26.5q78 0 135.5 52.5t57.5 127.5q0 55 -46 88t-110 33h-69l-25 78l221 211l60 49v4q-39 -6 -74 -6h-283l25 137h557l-19 -98l-274 -258q76 -14 135.5 -73.5t59.5 -162.5q0 -127 -101.5 -225t-251.5 -98q-88 0 -164.5 33.5 t-107.5 66.5z" /> -<glyph unicode="´" horiz-adv-x="1021" d="M186 1546l201 260h223l-245 -260h-179z" /> -<glyph unicode="µ" horiz-adv-x="1265" d="M-29 -410l281 1446h199l-119 -610q-12 -68 -13 -119q0 -72 36 -109.5t120 -37.5q150 0 266.5 123t147.5 282l92 471h199l-201 -1036h-195l25 121l27 98h-5q-53 -92 -165.5 -168t-253.5 -76q-125 0 -185 68h-4q-6 -104 -18 -164l-58 -289h-176z" /> -<glyph unicode="μ" horiz-adv-x="1265" d="M-29 -410l281 1446h199l-119 -610q-12 -68 -13 -119q0 -72 36 -109.5t120 -37.5q150 0 266.5 123t147.5 282l92 471h199l-201 -1036h-195l25 121l27 98h-5q-53 -92 -165.5 -168t-253.5 -76q-125 0 -185 68h-4q-6 -104 -18 -164l-58 -289h-176z" /> -<glyph unicode="¶" horiz-adv-x="1210" d="M147 909q0 215 173.5 376t388.5 161h581l-33 -176h-403l-266 -1372h-154l115 596q-162 0 -282 119.5t-120 295.5zM715 -102l241 1255h154l-244 -1255h-151z" /> -<glyph unicode="·" horiz-adv-x="552" d="M147 485l41 215h207l-41 -215h-207z" /> -<glyph unicode="¸" horiz-adv-x="1021" d="M184 -410l23 117q39 -12 84 -12t77.5 17.5t32.5 56.5q0 53 -96 53l-37 -2l103 227l96 -20l-2 -17l-47 -112q51 -8 87 -42t36 -92q0 -94 -73 -141t-163 -47q-33 0 -62.5 3t-43.5 7z" /> -<glyph unicode="¹" horiz-adv-x="796" d="M43 866l25 135h190l96 500l17 53h-4q-12 -16 -45 -45l-82 -65l-78 106l260 211h137l-147 -760h188l-27 -135h-530z" /> -<glyph unicode="º" horiz-adv-x="950" d="M141 543l23 116h641l-23 -116h-641zM217 1071q0 164 124 280.5t280 116.5q135 0 221 -79.5t86 -206.5q0 -164 -124 -280t-282 -116q-133 0 -219 80t-86 205zM367 1083q0 -76 46 -120.5t119 -44.5q94 0 170 74.5t76 181.5q0 72 -46 117.5t-118 45.5q-96 0 -171.5 -75 t-75.5 -179z" /> -<glyph unicode="»" horiz-adv-x="1134" d="M2 158l447 430l-263 411h189l264 -424l-426 -417h-211zM446 158l410 430l-262 411h188l265 -424l-392 -417h-209z" /> -<glyph unicode="¼" horiz-adv-x="1966" d="M104 551l25 135h190l97 500l16 53h-4q-12 -16 -45 -45l-82 -66l-78 107l260 211h138l-148 -760h189l-27 -135h-531zM410 0l966 1446h164l-967 -1446h-163zM1087 219l19 103l516 573h176l-106 -541h127l-25 -135h-127l-43 -219h-151l43 219h-429zM1290 354h250l49 252 l31 119h-4q-37 -55 -78 -98l-248 -269v-4z" /> -<glyph unicode="½" horiz-adv-x="1947" d="M104 551l25 135h190l97 500l16 53h-4q-12 -16 -45 -45l-82 -66l-78 107l260 211h138l-148 -760h189l-27 -135h-531zM414 0l966 1446h164l-966 -1446h-164zM1112 0q2 119 60.5 209t139.5 143t161.5 98.5t137 99.5t56.5 118q0 47 -34 76.5t-89 29.5q-45 0 -93 -24.5 t-75 -49.5l-24 -24l-90 100q14 16 39.5 39t102.5 61.5t150 38.5q121 0 197 -64.5t76 -170.5q0 -88 -48 -157.5t-119 -116t-143.5 -85t-133 -86t-76.5 -100.5h430l-27 -135h-598z" /> -<glyph unicode="¾" horiz-adv-x="1984" d="M84 666l96 100q8 -10 23.5 -25.5t71 -42t116.5 -26.5q78 0 135.5 52t57.5 128q0 55 -46 88t-110 33h-70l-24 78l221 211l59 49v4q-39 -6 -73 -6h-283l25 137h557l-19 -98l-274 -258q76 -14 135 -74t59 -162q0 -127 -101 -225.5t-251 -98.5q-88 0 -165 34t-109 67zM428 0 l967 1446h164l-967 -1446h-164zM1106 219l18 103l516 573h177l-107 -541h127l-25 -135h-126l-44 -219h-151l43 219h-428zM1309 354h250l49 252l30 119h-4q-37 -55 -78 -98l-247 -269v-4z" /> -<glyph unicode="¿" horiz-adv-x="923" d="M-51 -102q0 100 45 183t111.5 139t135 106.5t124 111t67.5 125.5l17 76h194l-18 -88q-18 -90 -72.5 -166t-120 -127t-127 -99t-103.5 -107.5t-42 -129.5q0 -74 53 -121t143 -47q59 0 122 22.5t95 43.5l33 22l88 -153q-18 -12 -51 -33t-128 -53.5t-185 -32.5 q-166 0 -273.5 89t-107.5 239zM477 836l41 200h205l-39 -200h-207z" /> -<glyph unicode="À" horiz-adv-x="1282" d="M-98 0l792 1446h226l235 -1446h-203l-63 416h-545l-225 -416h-217zM428 584h440l-71 458l-21 205h-4q-55 -131 -94 -205zM598 1806h205l96 -260h-158z" /> -<glyph unicode="Á" horiz-adv-x="1282" d="M-98 0l792 1446h226l235 -1446h-203l-63 416h-545l-225 -416h-217zM428 584h440l-71 458l-21 205h-4q-55 -131 -94 -205zM733 1546l201 260h223l-246 -260h-178z" /> -<glyph unicode="Â" horiz-adv-x="1282" d="M-98 0l792 1446h226l235 -1446h-203l-63 416h-545l-225 -416h-217zM428 584h440l-71 458l-21 205h-4q-55 -131 -94 -205zM537 1546l231 260h207l129 -260h-168l-74 164h-4l-139 -164h-182z" /> -<glyph unicode="Ã" horiz-adv-x="1282" d="M-98 0l792 1446h226l235 -1446h-203l-63 416h-545l-225 -416h-217zM428 584h440l-71 458l-21 205h-4q-55 -131 -94 -205zM498 1548q49 260 243 260q55 0 94.5 -34.5t68 -69.5t61.5 -35q78 0 100 133h145q-51 -260 -243 -260q-53 0 -92 35t-70 69.5t-64 34.5 q-72 0 -98 -133h-145z" /> -<glyph unicode="Ä" horiz-adv-x="1282" d="M-98 0l792 1446h226l235 -1446h-203l-63 416h-545l-225 -416h-217zM428 584h440l-71 458l-21 205h-4q-55 -131 -94 -205zM588 1599l41 207h164l-41 -207h-164zM932 1599l39 207h164l-41 -207h-162z" /> -<glyph unicode="Å" horiz-adv-x="1282" d="M-98 0l792 1446h226l235 -1446h-203l-63 416h-545l-225 -416h-217zM428 584h440l-71 458l-21 205h-4q-55 -131 -94 -205zM678 1655q0 76 59.5 124t132.5 48q72 0 116 -36t44 -99q0 -74 -60.5 -122t-133.5 -48q-70 0 -114 35t-44 98zM784 1657q0 -51 58 -51 q33 0 57.5 24.5t24.5 59.5q0 25 -15.5 40t-42.5 15q-33 0 -57.5 -25.5t-24.5 -62.5z" /> -<glyph unicode="Æ" horiz-adv-x="1816" d="M-102 0l874 1446h1075l-35 -176h-638l-89 -453h519l-35 -176h-518l-90 -465h671l-35 -176h-872l125 643h-344l-383 -643h-225zM606 811h277l88 459h-92z" /> -<glyph unicode="Ç" horiz-adv-x="1484" d="M115 602q0 231 118.5 433t316.5 318.5t421 116.5q102 0 193 -19t148.5 -48t100.5 -57.5t62 -47.5l18 -20l-121 -139q-16 16 -47 40.5t-133 64.5t-215 40q-270 0 -461.5 -201.5t-191.5 -470.5q0 -197 117.5 -323.5t322.5 -126.5q236 0 453 164l28 22l88 -160 q-10 -8 -28.5 -22t-78 -51t-123 -66t-159.5 -51.5t-190 -22.5h-2l-33 -77q51 -8 87 -42t36 -92q0 -94 -73 -141t-163 -47q-33 0 -62.5 3t-43.5 7l-15 4l23 117q39 -12 84 -12t77.5 17.5t32.5 56.5q0 53 -96 53l-37 -2l74 164q-246 33 -387 200.5t-141 417.5z" /> -<glyph unicode="È" horiz-adv-x="1171" d="M78 0l284 1446h838l-35 -176h-637l-88 -453h518l-34 -176h-518l-91 -465h672l-33 -176h-876zM592 1806h205l96 -260h-158z" /> -<glyph unicode="É" horiz-adv-x="1171" d="M78 0l284 1446h838l-35 -176h-637l-88 -453h518l-34 -176h-518l-91 -465h672l-33 -176h-876zM727 1546l201 260h223l-246 -260h-178z" /> -<glyph unicode="Ê" horiz-adv-x="1171" d="M78 0l284 1446h838l-35 -176h-637l-88 -453h518l-34 -176h-518l-91 -465h672l-33 -176h-876zM530 1546l232 260h207l129 -260h-168l-74 164h-4l-139 -164h-183z" /> -<glyph unicode="Ë" horiz-adv-x="1171" d="M78 0l284 1446h838l-35 -176h-637l-88 -453h518l-34 -176h-518l-91 -465h672l-33 -176h-876zM580 1599l41 207h163l-41 -207h-163zM924 1599l39 207h163l-41 -207h-161z" /> -<glyph unicode="Ì" horiz-adv-x="595" d="M78 0l282 1446h201l-280 -1446h-203zM252 1806h205l96 -260h-158z" /> -<glyph unicode="Í" horiz-adv-x="595" d="M78 0l282 1446h201l-280 -1446h-203zM385 1546l201 260h223l-246 -260h-178z" /> -<glyph unicode="Î" horiz-adv-x="595" d="M78 0l282 1446h201l-280 -1446h-203zM190 1546l232 260h207l129 -260h-168l-74 164h-4l-139 -164h-183z" /> -<glyph unicode="Ï" horiz-adv-x="595" d="M78 0l282 1446h201l-280 -1446h-203zM242 1599l41 207h163l-40 -207h-164zM586 1599l39 207h163l-40 -207h-162z" /> -<glyph unicode="Ð" horiz-adv-x="1550" d="M115 0l123 639h-119l33 168h118l125 639h447q299 0 469 -147.5t170 -415.5q0 -242 -107.5 -442.5t-304.5 -320.5t-442 -120h-512zM348 176h264q287 0 473.5 197.5t186.5 492.5q0 195 -119 299.5t-328 104.5h-262l-92 -463h309l-32 -168h-310z" /> -<glyph unicode="Ñ" horiz-adv-x="1536" d="M78 0l282 1446h187l463 -940q37 -76 77 -209h5q10 129 26 209l182 940h203l-282 -1446h-187l-463 938q-39 80 -79 211h-5q-10 -129 -26 -211l-182 -938h-201zM618 1548q49 260 244 260q55 0 94 -34.5t68 -69.5t61 -35q78 0 101 133h145q-51 -260 -244 -260q-53 0 -92 35 t-69.5 69.5t-63.5 34.5q-72 0 -98 -133h-146z" /> -<glyph unicode="Ò" horiz-adv-x="1677" d="M109 606q0 227 122.5 429t322.5 318.5t417 116.5q289 0 467 -172t178 -442q0 -231 -125 -437t-324.5 -325t-414.5 -119q-289 0 -466 177.5t-177 453.5zM315 614q0 -201 123 -326.5t316 -125.5q250 0 451.5 203.5t201.5 480.5q0 195 -122 316.5t-316 121.5 q-252 0 -453 -199t-201 -471zM786 1806h205l96 -260h-157z" /> -<glyph unicode="Ó" horiz-adv-x="1677" d="M109 606q0 227 122.5 429t322.5 318.5t417 116.5q289 0 467 -172t178 -442q0 -231 -125 -437t-324.5 -325t-414.5 -119q-289 0 -466 177.5t-177 453.5zM315 614q0 -201 123 -326.5t316 -125.5q250 0 451.5 203.5t201.5 480.5q0 195 -122 316.5t-316 121.5 q-252 0 -453 -199t-201 -471zM922 1546l200 260h224l-246 -260h-178z" /> -<glyph unicode="Ô" horiz-adv-x="1677" d="M109 606q0 227 122.5 429t322.5 318.5t417 116.5q289 0 467 -172t178 -442q0 -231 -125 -437t-324.5 -325t-414.5 -119q-289 0 -466 177.5t-177 453.5zM315 614q0 -201 123 -326.5t316 -125.5q250 0 451.5 203.5t201.5 480.5q0 195 -122 316.5t-316 121.5 q-252 0 -453 -199t-201 -471zM725 1546l231 260h207l129 -260h-168l-73 164h-4l-140 -164h-182z" /> -<glyph unicode="Õ" horiz-adv-x="1677" d="M109 606q0 227 122.5 429t322.5 318.5t417 116.5q289 0 467 -172t178 -442q0 -231 -125 -437t-324.5 -325t-414.5 -119q-289 0 -466 177.5t-177 453.5zM315 614q0 -201 123 -326.5t316 -125.5q250 0 451.5 203.5t201.5 480.5q0 195 -122 316.5t-316 121.5 q-252 0 -453 -199t-201 -471zM686 1548q49 260 244 260q55 0 94 -34.5t67.5 -69.5t61.5 -35q78 0 100 133h146q-51 -260 -244 -260q-53 0 -92 35t-69.5 69.5t-63.5 34.5q-72 0 -99 -133h-145z" /> -<glyph unicode="Ö" horiz-adv-x="1677" d="M109 606q0 227 122.5 429t322.5 318.5t417 116.5q289 0 467 -172t178 -442q0 -231 -125 -437t-324.5 -325t-414.5 -119q-289 0 -466 177.5t-177 453.5zM315 614q0 -201 123 -326.5t316 -125.5q250 0 451.5 203.5t201.5 480.5q0 195 -122 316.5t-316 121.5 q-252 0 -453 -199t-201 -471zM776 1599l41 207h164l-41 -207h-164zM1120 1599l39 207h164l-41 -207h-162z" /> -<glyph unicode="×" horiz-adv-x="1409" d="M170 113l422 471l-422 471l113 112l417 -467l420 467l113 -112l-424 -471l424 -471l-113 -113l-420 465l-417 -465z" /> -<glyph unicode="Ø" horiz-adv-x="1681" d="M113 606q0 227 122.5 429t322.5 318.5t417 116.5q221 0 385 -108l127 137l94 -78l-127 -137q164 -170 164 -428q0 -231 -124 -437t-323.5 -325t-414.5 -119q-229 0 -398 119l-133 -145l-94 76l137 149q-155 172 -155 432zM319 614q0 -172 89 -288l817 886 q-111 72 -252 72q-252 0 -453 -199t-201 -471zM496 242q109 -80 262 -80q248 0 449.5 203.5t201.5 480.5q0 168 -94 284z" /> -<glyph unicode="Ù" horiz-adv-x="1488" d="M147 403q0 55 13 117l180 926h201l-181 -932q-8 -39 -8 -86q0 -127 80 -196.5t225 -69.5q168 0 285 94t150 262l182 928h201l-185 -944q-47 -242 -219 -384.5t-418 -142.5q-225 0 -365.5 113.5t-140.5 314.5zM696 1806h205l96 -260h-157z" /> -<glyph unicode="Ú" horiz-adv-x="1488" d="M147 403q0 55 13 117l180 926h201l-181 -932q-8 -39 -8 -86q0 -127 80 -196.5t225 -69.5q168 0 285 94t150 262l182 928h201l-185 -944q-47 -242 -219 -384.5t-418 -142.5q-225 0 -365.5 113.5t-140.5 314.5zM831 1546l201 260h223l-245 -260h-179z" /> -<glyph unicode="Û" horiz-adv-x="1488" d="M147 403q0 55 13 117l180 926h201l-181 -932q-8 -39 -8 -86q0 -127 80 -196.5t225 -69.5q168 0 285 94t150 262l182 928h201l-185 -944q-47 -242 -219 -384.5t-418 -142.5q-225 0 -365.5 113.5t-140.5 314.5zM635 1546l231 260h207l129 -260h-168l-73 164h-5l-139 -164 h-182z" /> -<glyph unicode="Ü" horiz-adv-x="1488" d="M147 403q0 55 13 117l180 926h201l-181 -932q-8 -39 -8 -86q0 -127 80 -196.5t225 -69.5q168 0 285 94t150 262l182 928h201l-185 -944q-47 -242 -219 -384.5t-418 -142.5q-225 0 -365.5 113.5t-140.5 314.5zM684 1599l41 207h164l-41 -207h-164zM1028 1599l39 207h164 l-41 -207h-162z" /> -<glyph unicode="Ý" horiz-adv-x="1185" d="M164 1446h217l174 -475q29 -80 53 -183h4q61 98 123 181l355 477h243l-651 -840l-119 -606h-201l121 612zM670 1546l200 260h224l-246 -260h-178z" /> -<glyph unicode="Þ" horiz-adv-x="1247" d="M78 0l282 1446h203l-49 -246h295q135 0 227 -47q180 -94 181 -322q0 -170 -87.5 -304t-228.5 -195q-102 -43 -215 -43h-348l-57 -289h-203zM371 465h295q88 0 153 33q86 41 137.5 124t51.5 195q0 98 -60.5 152.5t-171.5 54.5h-297z" /> -<glyph unicode="ß" horiz-adv-x="1200" d="M37 0l213 1102q33 172 174 270t309 98q164 0 263.5 -80.5t99.5 -207.5q0 -82 -45 -151.5t-98.5 -107.5t-98.5 -86.5t-45 -91.5q0 -41 44 -89t97.5 -87t97.5 -104.5t44 -136.5q0 -141 -118 -241.5t-272 -100.5q-86 0 -161.5 14t-108.5 29l-33 16l35 172q100 -59 254 -59 q76 0 138.5 43t62.5 127q0 43 -30 84t-72 75.5t-82.5 69.5t-70.5 81t-30 95q0 70 45 132.5t99.5 102.5t99.5 92t45 103q0 57 -43 96t-125 39q-98 0 -178 -59t-103 -168l-208 -1071h-199z" /> -<glyph unicode="à" d="M0 238q0 119 66.5 204.5t176 127.5t219 59.5t228.5 17.5h51q8 41 9 84q0 162 -187 162q-72 0 -148.5 -24.5t-119.5 -49.5l-41 -24l-53 157q18 12 53 30.5t137.5 48.5t200.5 30q162 0 261 -75t99 -232q0 -57 -12 -115l-125 -639h-184l20 104q14 82 23 82h-4 q2 0 -13.5 -21.5t-46 -52t-71.5 -62.5t-102.5 -53.5t-127.5 -21.5q-129 0 -219 71t-90 192zM203 270q0 -57 42 -96t124 -39q117 0 213 101.5t127 226.5l8 35h-51q-463 -1 -463 -228zM410 1446h204l97 -260h-158z" /> -<glyph unicode="á" d="M0 238q0 119 66.5 204.5t176 127.5t219 59.5t228.5 17.5h51q8 41 9 84q0 162 -187 162q-72 0 -148.5 -24.5t-119.5 -49.5l-41 -24l-53 157q18 12 53 30.5t137.5 48.5t200.5 30q162 0 261 -75t99 -232q0 -57 -12 -115l-125 -639h-184l20 104q14 82 23 82h-4 q2 0 -13.5 -21.5t-46 -52t-71.5 -62.5t-102.5 -53.5t-127.5 -21.5q-129 0 -219 71t-90 192zM203 270q0 -57 42 -96t124 -39q117 0 213 101.5t127 226.5l8 35h-51q-463 -1 -463 -228zM545 1186l200 260h224l-246 -260h-178z" /> -<glyph unicode="â" d="M0 238q0 119 66.5 204.5t176 127.5t219 59.5t228.5 17.5h51q8 41 9 84q0 162 -187 162q-72 0 -148.5 -24.5t-119.5 -49.5l-41 -24l-53 157q18 12 53 30.5t137.5 48.5t200.5 30q162 0 261 -75t99 -232q0 -57 -12 -115l-125 -639h-184l20 104q14 82 23 82h-4 q2 0 -13.5 -21.5t-46 -52t-71.5 -62.5t-102.5 -53.5t-127.5 -21.5q-129 0 -219 71t-90 192zM203 270q0 -57 42 -96t124 -39q117 0 213 101.5t127 226.5l8 35h-51q-463 -1 -463 -228zM348 1186l232 260h206l129 -260h-167l-74 164h-4l-140 -164h-182z" /> -<glyph unicode="ã" d="M0 238q0 119 66.5 204.5t176 127.5t219 59.5t228.5 17.5h51q8 41 9 84q0 162 -187 162q-72 0 -148.5 -24.5t-119.5 -49.5l-41 -24l-53 157q18 12 53 30.5t137.5 48.5t200.5 30q162 0 261 -75t99 -232q0 -57 -12 -115l-125 -639h-184l20 104q14 82 23 82h-4 q2 0 -13.5 -21.5t-46 -52t-71.5 -62.5t-102.5 -53.5t-127.5 -21.5q-129 0 -219 71t-90 192zM203 270q0 -57 42 -96t124 -39q117 0 213 101.5t127 226.5l8 35h-51q-463 -1 -463 -228zM309 1188q49 260 244 260q55 0 94 -35t67.5 -69.5t61.5 -34.5q78 0 101 133h145 q-51 -260 -244 -260q-53 0 -92 34.5t-69.5 69.5t-63.5 35q-72 0 -98 -133h-146z" /> -<glyph unicode="ä" d="M0 238q0 119 66.5 204.5t176 127.5t219 59.5t228.5 17.5h51q8 41 9 84q0 162 -187 162q-72 0 -148.5 -24.5t-119.5 -49.5l-41 -24l-53 157q18 12 53 30.5t137.5 48.5t200.5 30q162 0 261 -75t99 -232q0 -57 -12 -115l-125 -639h-184l20 104q14 82 23 82h-4 q2 0 -13.5 -21.5t-46 -52t-71.5 -62.5t-102.5 -53.5t-127.5 -21.5q-129 0 -219 71t-90 192zM203 270q0 -57 42 -96t124 -39q117 0 213 101.5t127 226.5l8 35h-51q-463 -1 -463 -228zM397 1239l41 207h164l-41 -207h-164zM741 1239l39 207h164l-41 -207h-162z" /> -<glyph unicode="å" d="M0 238q0 119 66.5 204.5t176 127.5t219 59.5t228.5 17.5h51q8 41 9 84q0 162 -187 162q-72 0 -148.5 -24.5t-119.5 -49.5l-41 -24l-53 157q18 12 53 30.5t137.5 48.5t200.5 30q162 0 261 -75t99 -232q0 -57 -12 -115l-125 -639h-184l20 104q14 82 23 82h-4 q2 0 -13.5 -21.5t-46 -52t-71.5 -62.5t-102.5 -53.5t-127.5 -21.5q-129 0 -219 71t-90 192zM203 270q0 -57 42 -96t124 -39q117 0 213 101.5t127 226.5l8 35h-51q-463 -1 -463 -228zM487 1294q0 76 59.5 124t133.5 48q72 0 116 -35.5t44 -99.5q0 -74 -60.5 -122t-134.5 -48 q-70 0 -114 35t-44 98zM594 1296q0 -51 57 -51q33 0 57.5 24.5t24.5 59.5q0 25 -15.5 40t-41.5 15q-33 0 -57.5 -25.5t-24.5 -62.5z" /> -<glyph unicode="æ" horiz-adv-x="1761" d="M2 238q0 121 63.5 204.5t172 124.5t217 57.5t233.5 16.5h53q10 66 11 88q0 164 -193 164q-147 -2 -303 -98l-53 157q20 12 54 30.5t135.5 48.5t195.5 30q248 0 311 -174h4q154 174 385 174q195 0 296.5 -103.5t101.5 -281.5q0 -35 -7.5 -80t-15.5 -74l-8 -28h-746 q-6 -37 -6 -68q0 -125 74 -202t209 -77q80 0 162 31t125 60l43 30l57 -157q-18 -14 -53 -37t-139.5 -61t-202.5 -38q-160 0 -272.5 69t-155.5 187h-5q-12 -27 -38.5 -61.5t-76.5 -82.5t-131 -80t-175 -32q-137 0 -229.5 70t-92.5 193zM205 270q0 -59 43 -97t123 -38 q119 0 214 102.5t124 227.5l6 27h-94q-416 -1 -416 -222zM946 643h537q4 33 4 53q0 100 -56.5 153.5t-144.5 53.5q-115 0 -205 -68.5t-135 -191.5z" /> -<glyph unicode="ç" horiz-adv-x="1120" d="M55 426q0 262 190.5 448.5t448.5 186.5q236 0 373 -131l18 -19l-110 -129q-10 12 -31.5 29.5t-92.5 47.5t-146 30q-178 0 -312.5 -132t-134.5 -317q0 -131 83 -212t220 -81q86 0 173 35t130 70l45 35l56 -158q-18 -16 -53 -42t-146 -69t-223 -43h-4l-33 -77q51 -8 87 -42 t36 -92q0 -94 -73 -141t-163 -47q-33 0 -62.5 3t-43.5 7l-15 4l23 117q39 -12 84 -12t77.5 17.5t32.5 56.5q0 53 -96 53l-37 -2l74 166q-174 29 -274.5 147.5t-100.5 292.5z" /> -<glyph unicode="è" horiz-adv-x="1128" d="M55 418q0 262 173 452.5t429 190.5q195 0 295.5 -104.5t100.5 -278.5q0 -37 -8.5 -84t-16.5 -76l-8 -29h-756q-6 -31 -6 -61q0 -121 78 -201t217 -80q80 0 162 31t125 60l43 30l57 -157q-18 -14 -53 -37t-139.5 -61t-202.5 -38q-223 0 -356.5 123t-133.5 320zM297 639 h553q4 23 4 55q0 100 -55.5 154.5t-145.5 54.5q-115 0 -212 -71.5t-144 -192.5zM479 1446h205l96 -260h-157z" /> -<glyph unicode="é" horiz-adv-x="1128" d="M55 418q0 262 173 452.5t429 190.5q195 0 295.5 -104.5t100.5 -278.5q0 -37 -8.5 -84t-16.5 -76l-8 -29h-756q-6 -31 -6 -61q0 -121 78 -201t217 -80q80 0 162 31t125 60l43 30l57 -157q-18 -14 -53 -37t-139.5 -61t-202.5 -38q-223 0 -356.5 123t-133.5 320zM297 639 h553q4 23 4 55q0 100 -55.5 154.5t-145.5 54.5q-115 0 -212 -71.5t-144 -192.5zM614 1186l201 260h223l-245 -260h-179z" /> -<glyph unicode="ê" horiz-adv-x="1128" d="M55 418q0 262 173 452.5t429 190.5q195 0 295.5 -104.5t100.5 -278.5q0 -37 -8.5 -84t-16.5 -76l-8 -29h-756q-6 -31 -6 -61q0 -121 78 -201t217 -80q80 0 162 31t125 60l43 30l57 -157q-18 -14 -53 -37t-139.5 -61t-202.5 -38q-223 0 -356.5 123t-133.5 320zM297 639 h553q4 23 4 55q0 100 -55.5 154.5t-145.5 54.5q-115 0 -212 -71.5t-144 -192.5zM418 1186l231 260h207l129 -260h-168l-74 164h-4l-139 -164h-182z" /> -<glyph unicode="ë" horiz-adv-x="1128" d="M55 418q0 262 173 452.5t429 190.5q195 0 295.5 -104.5t100.5 -278.5q0 -37 -8.5 -84t-16.5 -76l-8 -29h-756q-6 -31 -6 -61q0 -121 78 -201t217 -80q80 0 162 31t125 60l43 30l57 -157q-18 -14 -53 -37t-139.5 -61t-202.5 -38q-223 0 -356.5 123t-133.5 320zM297 639 h553q4 23 4 55q0 100 -55.5 154.5t-145.5 54.5q-115 0 -212 -71.5t-144 -192.5zM469 1239l41 207h164l-41 -207h-164zM813 1239l39 207h164l-41 -207h-162z" /> -<glyph unicode="ì" horiz-adv-x="507" d="M37 0l201 1036h198l-200 -1036h-199zM137 1446h205l96 -260h-157z" /> -<glyph unicode="í" horiz-adv-x="507" d="M37 0l201 1036h198l-200 -1036h-199zM272 1186l201 260h223l-245 -260h-179z" /> -<glyph unicode="î" horiz-adv-x="507" d="M37 0l201 1036h198l-200 -1036h-199zM76 1186l231 260h207l129 -260h-168l-74 164h-4l-139 -164h-182z" /> -<glyph unicode="ï" horiz-adv-x="507" d="M37 0l201 1036h198l-200 -1036h-199zM125 1239l41 207h164l-41 -207h-164zM469 1239l39 207h164l-41 -207h-162z" /> -<glyph unicode="ð" horiz-adv-x="1202" d="M51 391q0 217 161 390t417 173q76 0 139 -23.5t88 -45.5l27 -25h4q-35 164 -174 283l-406 -162l4 129l285 115q-111 63 -250 100l82 148q217 -55 373 -166l325 131l-2 -129l-221 -88q199 -203 199 -502q0 -90 -21.5 -187.5t-69.5 -198t-117 -179t-175.5 -129 t-231.5 -50.5q-209 0 -322.5 119t-113.5 297zM254 395q0 -109 60.5 -178.5t174.5 -69.5q166 0 279 141.5t113 295.5q0 94 -65.5 152.5t-178.5 58.5q-162 0 -272.5 -119t-110.5 -281z" /> -<glyph unicode="ñ" horiz-adv-x="1232" d="M37 0l201 1036h194l-22 -121l-29 -98h4q49 90 168 167t260 77q143 0 223 -68.5t80 -206.5q0 -49 -14 -131l-127 -655h-199l119 612q14 76 14 117q0 150 -153.5 150t-275.5 -119t-154 -287l-90 -473h-199zM422 1188q49 260 244 260q55 0 94 -35t67.5 -69.5t61.5 -34.5 q78 0 100 133h146q-51 -260 -244 -260q-53 0 -92 34.5t-70 69.5t-63 35q-72 0 -99 -133h-145z" /> -<glyph unicode="ò" horiz-adv-x="1273" d="M53 432q0 260 195.5 444.5t445.5 184.5q217 0 354.5 -126t137.5 -327q0 -262 -195.5 -447.5t-443.5 -185.5q-219 0 -356.5 127t-137.5 330zM256 440q0 -131 82 -212t211 -81q166 0 300 132.5t134 318.5q0 129 -82 210t-209 81q-170 0 -303 -131.5t-133 -317.5zM520 1446 h205l96 -260h-157z" /> -<glyph unicode="ó" horiz-adv-x="1273" d="M53 432q0 260 195.5 444.5t445.5 184.5q217 0 354.5 -126t137.5 -327q0 -262 -195.5 -447.5t-443.5 -185.5q-219 0 -356.5 127t-137.5 330zM256 440q0 -131 82 -212t211 -81q166 0 300 132.5t134 318.5q0 129 -82 210t-209 81q-170 0 -303 -131.5t-133 -317.5zM655 1186 l201 260h223l-245 -260h-179z" /> -<glyph unicode="ô" horiz-adv-x="1273" d="M53 432q0 260 195.5 444.5t445.5 184.5q217 0 354.5 -126t137.5 -327q0 -262 -195.5 -447.5t-443.5 -185.5q-219 0 -356.5 127t-137.5 330zM256 440q0 -131 82 -212t211 -81q166 0 300 132.5t134 318.5q0 129 -82 210t-209 81q-170 0 -303 -131.5t-133 -317.5zM459 1186 l231 260h207l129 -260h-168l-74 164h-4l-139 -164h-182z" /> -<glyph unicode="õ" horiz-adv-x="1273" d="M53 432q0 260 195.5 444.5t445.5 184.5q217 0 354.5 -126t137.5 -327q0 -262 -195.5 -447.5t-443.5 -185.5q-219 0 -356.5 127t-137.5 330zM256 440q0 -131 82 -212t211 -81q166 0 300 132.5t134 318.5q0 129 -82 210t-209 81q-170 0 -303 -131.5t-133 -317.5zM418 1188 q49 260 244 260q55 0 94 -35t67.5 -69.5t61.5 -34.5q78 0 100 133h145q-51 -260 -243 -260q-53 0 -92 34.5t-70 69.5t-63 35q-72 0 -99 -133h-145z" /> -<glyph unicode="ö" horiz-adv-x="1273" d="M53 432q0 260 195.5 444.5t445.5 184.5q217 0 354.5 -126t137.5 -327q0 -262 -195.5 -447.5t-443.5 -185.5q-219 0 -356.5 127t-137.5 330zM256 440q0 -131 82 -212t211 -81q166 0 300 132.5t134 318.5q0 129 -82 210t-209 81q-170 0 -303 -131.5t-133 -317.5zM508 1239 l41 207h164l-41 -207h-164zM852 1239l39 207h164l-41 -207h-162z" /> -<glyph unicode="÷" horiz-adv-x="1292" d="M123 504v160h1034v-160h-1034zM543 90v186h192v-186h-192zM543 891v186h192v-186h-192z" /> -<glyph unicode="ø" horiz-adv-x="1273" d="M53 432q0 260 195.5 444.5t445.5 184.5q164 0 287 -76l111 121l92 -76l-111 -121q113 -123 113 -301q0 -262 -195.5 -447.5t-443.5 -185.5q-152 0 -275 68l-110 -121l-90 78l106 115q-125 124 -125 317zM256 440q0 -109 55 -182l541 588q-74 43 -160 43 q-170 0 -303 -131.5t-133 -317.5zM401 182q63 -35 148 -35q166 0 300 132.5t134 318.5q0 92 -45 166z" /> -<glyph unicode="ù" horiz-adv-x="1220" d="M80 250q0 49 14 131l127 655h199l-119 -610q-12 -68 -12 -119q0 -72 35.5 -109.5t119.5 -37.5q150 0 266.5 123t147.5 282l92 471h199l-201 -1036h-194l24 121l27 98h-4q-53 -92 -166 -168t-254 -76q-133 0 -217 67t-84 208zM483 1446h205l96 -260h-157z" /> -<glyph unicode="ú" horiz-adv-x="1220" d="M80 250q0 49 14 131l127 655h199l-119 -610q-12 -68 -12 -119q0 -72 35.5 -109.5t119.5 -37.5q150 0 266.5 123t147.5 282l92 471h199l-201 -1036h-194l24 121l27 98h-4q-53 -92 -166 -168t-254 -76q-133 0 -217 67t-84 208zM618 1186l201 260h223l-245 -260h-179z" /> -<glyph unicode="û" horiz-adv-x="1220" d="M80 250q0 49 14 131l127 655h199l-119 -610q-12 -68 -12 -119q0 -72 35.5 -109.5t119.5 -37.5q150 0 266.5 123t147.5 282l92 471h199l-201 -1036h-194l24 121l27 98h-4q-53 -92 -166 -168t-254 -76q-133 0 -217 67t-84 208zM422 1186l231 260h207l129 -260h-168l-73 164 h-5l-139 -164h-182z" /> -<glyph unicode="ü" horiz-adv-x="1220" d="M80 250q0 49 14 131l127 655h199l-119 -610q-12 -68 -12 -119q0 -72 35.5 -109.5t119.5 -37.5q150 0 266.5 123t147.5 282l92 471h199l-201 -1036h-194l24 121l27 98h-4q-53 -92 -166 -168t-254 -76q-133 0 -217 67t-84 208zM473 1239l41 207h164l-41 -207h-164z M817 1239l39 207h164l-41 -207h-162z" /> -<glyph unicode="ý" horiz-adv-x="1042" d="M-188 -362l92 141q43 -37 112 -37q129 0 220 149l75 123l-237 1022h207l139 -700l16 -123h2q31 68 60 119l389 704h223l-727 -1226q-143 -240 -358 -240q-125 0 -213 68zM532 1186l201 260h223l-245 -260h-179z" /> -<glyph unicode="þ" horiz-adv-x="1226" d="M-43 -410l358 1856h197l-94 -481l-21 -82h4q55 78 146.5 128t200.5 50q182 0 284.5 -115t102.5 -311q0 -285 -170 -472.5t-394 -187.5q-102 0 -187 46.5t-122 134.5h-4q-2 -43 -12 -97l-92 -469h-197zM319 414q0 -117 58.5 -192t173.5 -75q145 0 263 131.5t118 342.5 q0 125 -62.5 195.5t-171.5 70.5q-156 0 -267.5 -144.5t-111.5 -328.5z" /> -<glyph unicode="ÿ" horiz-adv-x="1042" d="M-188 -362l92 141q43 -37 112 -37q129 0 220 149l75 123l-237 1022h207l139 -700l16 -123h2q31 68 60 119l389 704h223l-727 -1226q-143 -240 -358 -240q-125 0 -213 68zM387 1239l41 207h164l-41 -207h-164zM731 1239l39 207h164l-41 -207h-162z" /> -<glyph unicode="Œ" horiz-adv-x="1964" d="M109 598q0 229 120.5 431t319.5 318.5t422 116.5q63 0 156.5 -9t132.5 -9h735l-35 -176h-639l-88 -453h518l-35 -176h-518l-90 -465h674l-35 -176h-743q-31 0 -116 -9t-138 -9q-289 0 -465 173t-176 443zM315 598q0 -193 121 -314.5t324 -121.5q37 0 73.5 4t55.5 8l18 4 l211 1092q-59 14 -141 14q-268 0 -465 -202.5t-197 -483.5z" /> -<glyph unicode="œ" horiz-adv-x="2039" d="M53 432q0 260 194.5 444.5t444.5 184.5q145 0 254 -65.5t162 -180.5h4q80 115 199 180.5t258 65.5q195 0 295 -104.5t100 -278.5q0 -37 -8 -84t-17 -76l-8 -29h-753q-6 -35 -7 -63q0 -127 82 -203t213 -76q78 0 161 31t126 60l43 30l55 -157q-18 -14 -53 -37t-139.5 -61 t-202.5 -38q-154 0 -264.5 67t-161.5 185h-4q-88 -117 -216 -184.5t-265 -67.5q-219 0 -355.5 127t-136.5 330zM256 440q0 -131 81 -212t210 -81q166 0 300 132.5t134 318.5q0 129 -81 210t-210 81q-168 0 -301 -131.5t-133 -317.5zM1210 639h551q6 27 6 55q0 100 -55 154.5 t-145 54.5q-117 0 -213.5 -70.5t-143.5 -193.5z" /> -<glyph unicode="Ÿ" horiz-adv-x="1185" d="M164 1446h217l174 -475q29 -80 53 -183h4q61 98 123 181l355 477h243l-651 -840l-119 -606h-201l121 612zM522 1599l41 207h164l-41 -207h-164zM866 1599l39 207h164l-41 -207h-162z" /> -<glyph unicode="ˆ" horiz-adv-x="1021" d="M82 1546l231 260h207l129 -260h-168l-73 164h-5l-139 -164h-182z" /> -<glyph unicode="˜" horiz-adv-x="1021" d="M39 1548q49 260 244 260q55 0 94 -34.5t67.5 -69.5t61.5 -35q78 0 100 133h146q-51 -260 -244 -260q-53 0 -92 35t-70 69.5t-63 34.5q-72 0 -99 -133h-145z" /> -<glyph unicode="–" horiz-adv-x="1435" d="M158 504l30 160h1078l-31 -160h-1077z" /> -<glyph unicode="—" horiz-adv-x="1845" d="M158 504l30 160h1487l-30 -160h-1487z" /> -<glyph unicode="‘" horiz-adv-x="464" d="M182 1071l211 397h154l-164 -397h-201z" /> -<glyph unicode="’" horiz-adv-x="452" d="M188 1071l164 397h201l-211 -397h-154z" /> -<glyph unicode="‚" horiz-adv-x="509" d="M-66 -184l164 399h201l-211 -399h-154z" /> -<glyph unicode="“" horiz-adv-x="753" d="M182 1071l211 397h154l-164 -397h-201zM471 1071l211 397h154l-164 -397h-201z" /> -<glyph unicode="”" horiz-adv-x="741" d="M188 1071l166 397h199l-209 -397h-156zM477 1071l166 397h199l-209 -397h-156z" /> -<glyph unicode="„" horiz-adv-x="798" d="M-66 -184l164 399h201l-209 -399h-156zM223 -184l166 399h199l-209 -399h-156z" /> -<glyph unicode="•" horiz-adv-x="837" d="M98 596q0 133 92.5 225t225.5 92q131 0 223 -93t92 -224t-92 -224t-223 -93q-133 0 -225.5 92t-92.5 225z" /> -<glyph unicode="…" horiz-adv-x="1568" d="M35 0l41 215h209l-43 -215h-207zM565 0l43 215h207l-41 -215h-209zM1098 0l41 215h209l-43 -215h-207z" /> -<glyph unicode="‹" horiz-adv-x="708" d="M76 582l391 417h209l-410 -430l262 -411h-188z" /> -<glyph unicode="›" horiz-adv-x="708" d="M18 158l410 430l-260 411h188l265 -424l-394 -417h-209z" /> -<glyph unicode="€" horiz-adv-x="1202" d="M57 528l25 129h113q6 76 24 148h-108l24 131h127q102 236 314 385t456 149q61 0 120.5 -8t88.5 -16l29 -8l-82 -176q-72 20 -158 20q-168 0 -315.5 -95t-229.5 -251h578l-51 -131h-580q-23 -76 -29 -148h551l-49 -129h-489q18 -160 121.5 -260t281.5 -100q47 0 95.5 6 t72.5 14l25 7l4 -189q-92 -31 -207 -31q-258 0 -424 152t-186 401h-142z" /> -<glyph unicode="™" horiz-adv-x="2041" d="M176 1309v137h778v-137h-311v-764h-156v764h-311zM1020 545l72 901h141l213 -471l29 -86h4q12 49 26 86l213 471h144l69 -901h-153l-43 538l2 62h-4l-195 -434h-125l-194 434h-5l3 -62l-43 -538h-154z" /> -<glyph unicode="" horiz-adv-x="1035" d="M0 1035h1035v-1035h-1035v1035z" /> -<glyph unicode="fi" horiz-adv-x="1193" d="M92 0l170 874h-129l31 162h129l8 39q18 96 60 169t89.5 112t107.5 63.5t104.5 30.5t87.5 6l90 -6l-37 -170q-16 4 -47 4q-217 0 -258 -217l-6 -31h630l-202 -1036h-199l170 874h-430l-170 -874h-199zM961 1243l38 203h205l-41 -203h-202z" /> -<glyph unicode="fl" horiz-adv-x="1226" d="M92 0l168 864h-129l31 162h129l10 49q18 96 60 169t89.5 112t107.5 63.5t104.5 30.5t87.5 6l90 -6l-37 -170q-16 4 -47 4q-217 0 -258 -217l-9 -41h244l-31 -162h-243l-168 -864h-199zM758 209q0 33 10 88l223 1149h199l-215 -1114q-10 -47 -10 -78q0 -84 92 -84l33 2 l-37 -176q-29 -4 -60 -4q-98 0 -166.5 49t-68.5 168z" /> -<glyph unicode="ffi" horiz-adv-x="1880" d="M92 0l170 874h-129l31 162h129l8 39q18 96 60 169t89.5 112t107.5 63.5t104.5 30.5t87.5 6l90 -6l-37 -170q-16 4 -47 4q-217 0 -258 -217l-6 -31h487l8 39q18 96 60.5 169t89.5 112t107.5 63.5t104.5 30.5t87 6l90 -6l-37 -170q-16 4 -47 4q-217 0 -258 -217l-6 -31h630 l-202 -1036h-199l170 874h-430l-170 -874h-199l170 874h-487l-170 -874h-199zM1647 1243l39 203h204l-41 -203h-202z" /> -<glyph unicode="ffl" horiz-adv-x="1912" d="M92 0l170 874h-129l31 162h129l8 39q18 96 60 169t89.5 112t107.5 63.5t104.5 30.5t87.5 6l90 -6l-37 -170q-16 4 -47 4q-217 0 -258 -217l-6 -31h487l8 39q18 96 60.5 169t89.5 112t107.5 63.5t104.5 30.5t87 6l90 -6l-37 -170q-16 4 -47 4q-217 0 -258 -217l-6 -31h243 l-30 -162h-244l-170 -874h-199l170 874h-487l-170 -874h-199zM1444 209q0 33 10 88l223 1149h199l-215 -1114q-10 -47 -10 -78q0 -84 92 -84l33 2l-37 -176q-29 -4 -60 -4q-98 0 -166.5 49t-68.5 168z" /> -</font> -</defs></svg>
\ No newline at end of file diff --git a/web/cobrands/stevenage/fonts/MuseoSans_500_Italic-webfont.ttf b/web/cobrands/stevenage/fonts/MuseoSans_500_Italic-webfont.ttf Binary files differdeleted file mode 100755 index 445af3ac1..000000000 --- a/web/cobrands/stevenage/fonts/MuseoSans_500_Italic-webfont.ttf +++ /dev/null diff --git a/web/cobrands/stevenage/fonts/MuseoSans_500_Italic-webfont.woff b/web/cobrands/stevenage/fonts/MuseoSans_500_Italic-webfont.woff Binary files differdeleted file mode 100755 index 453194a98..000000000 --- a/web/cobrands/stevenage/fonts/MuseoSans_500_Italic-webfont.woff +++ /dev/null diff --git a/web/cobrands/stevenage/layout.scss b/web/cobrands/stevenage/layout.scss index ff7080c11..a94dc2a24 100644 --- a/web/cobrands/stevenage/layout.scss +++ b/web/cobrands/stevenage/layout.scss @@ -1,68 +1,252 @@ -@font-face { - font-family: 'MuseoSans'; - src: url('fonts/MuseoSans_300-webfont.eot'); - src: url('fonts/MuseoSans_300-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/MuseoSans_300-webfont.woff') format('woff'), - url('fonts/MuseoSans_300-webfont.ttf') format('truetype'), - url('fonts/MuseoSans_300-webfont.svg#MuseoSans300') format('svg'); - font-weight: normal; - font-style: normal; -} - -@font-face { - font-family: 'MuseoSans'; - src: url('fonts/MuseoSans_300_Italic-webfont.eot'); - src: url('fonts/MuseoSans_300_Italic-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/MuseoSans_300_Italic-webfont.woff') format('woff'), - url('fonts/MuseoSans_300_Italic-webfont.ttf') format('truetype'), - url('fonts/MuseoSans_300_Italic-webfont.svg#MuseoSans300Italic') format('svg'); - font-weight: normal; - font-style: italic; -} - -@font-face { - font-family: 'MuseoSans'; - src: url('fonts/MuseoSans_500-webfont.eot'); - src: url('fonts/MuseoSans_500-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/MuseoSans_500-webfont.woff') format('woff'), - url('fonts/MuseoSans_500-webfont.ttf') format('truetype'), - url('fonts/MuseoSans_500-webfont.svg#MuseoSans500') format('svg'); - font-weight: bold; - font-style: normal; -} - -@font-face { - font-family: 'MuseoSans'; - src: url('fonts/MuseoSans_500_Italic-webfont.eot'); - src: url('fonts/MuseoSans_500_Italic-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/MuseoSans_500_Italic-webfont.woff') format('woff'), - url('fonts/MuseoSans_500_Italic-webfont.ttf') format('truetype'), - url('fonts/MuseoSans_500_Italic-webfont.svg#MuseoSans500Italic') format('svg'); - font-weight: bold; - font-style: italic; -} - -@font-face { - font-family: 'Museo300-display'; - src: url('fonts/Museo300-Regular-webfont.eot'); - src: url('fonts/Museo300-Regular-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/Museo300-Regular-webfont.woff') format('woff'), - url('fonts/Museo300-Regular-webfont.ttf') format('truetype'), - url('fonts/Museo300-Regular-webfont.svg#Museo300') format('svg'); - font-weight: normal; - font-style: normal; -} - -/* Opera has a bug (from around 10.5 upwards to current 11.6) with showing the - * table caption *at all* if the header is set to a font-face :( */ -noindex:-o-prefocus, #site-header { - font-family: sans-serif; -} - -h3, h4 { - font-weight: bold; -} - -@import "_colours"; -@import "_layout"; +@import "colours"; +@import "../fixmystreet/layout"; +// d523b431 - "Stevenage Home page styles" +// 2a23e09f - Moved menu on map page and reverted to full header. + +body { + color: #222; + background: #dddddb; +} + +// d523b431 +.nav-wrapper{ + .nav-wrapper-2{ + min-height: auto; + // e7c122a4 / 0b0a619b / - "Removed mySociety menu and positioned menu" + top: 9.5em; + border-top: none; + padding-top: 0.75em; + padding-bottom: 0.25em; + background-color: #6b6969; + @include background(linear-gradient(#6b6969, #555454)); + } +} + +.ie6, .ie7 { + // 452ce6a0 - Added IE6/7 position change to front page header too + #stevenage_cc_header { + position:absolute; + top:0; + } + // 39ec0005 - Removed position static from nav in IE6/7 + .nav-wrapper { + .nav-wrapper-2 { + position: absolute; + } + } +} + +// d523b431 +#main-nav { + ul { + float: none; + li { + a, span { + margin: 0; + margin-right: 2px; + font-family: 'PTSansRegular', "PT Sans", Verdana, Arial, sans-serif; + } + } + &#main-menu { + li { + a, span { + padding: 0.5em 0.75em; + font-size: 0.8em; + margin: 0; + @include border-radius(0.25em); + } + a:hover { + background: #444; + } + a.report-a-problem-btn { + padding:0.5em 0.75em; + margin:0; + margin-left: 0.25em; + color:#fff; + } + span { + color: #fff; + background-color: #066539; + } + } + } + } +} + +// 452ce6a0 - "Added IE6/7 position change to front page header too" - +// turned off border for ie6-8 .content - why, as box-shadow still on? +.ie6, .ie7, .ie8 { + .content { + border: none; + } +} + +body.mappage { + // 15591af7 - Stevenage Map page changes + #stevenage_cc_header { + position: fixed; + } + // 2a23e09f - Moved menu on map page and reverted to full header. + .content { + margin-top: 9em; + } + // 15591af7 - Stevenage Map page changes + #main-nav ul#main-menu li a, #main-nav ul#main-menu li span { + padding: 0.5em 0.75em; + } + #main-nav ul#main-menu li a.report-a-problem-btn { + padding: 0.5em 0.75em; + margin: 0 0 0 0.25em; + } + // 2a23e09f - Moved menu on map page and reverted to full header. + .nav-wrapper { + .nav-wrapper-2 { + position: absolute; + top: 11em; + bottom: auto; + left: 0.5em; + width: 29em; + padding-top: 0.15em; + z-index: 0; + background-color: #6b6969; + @include background(linear-gradient(#6b6969, #555454)); + } + } +} + +.ie6, .ie7 { + // 82d34958 - IE6/7 Positioning Tweaks on Council header + body.mappage { + // a7a564af - Stevenage IE8 position tweak + #stevenage_cc_header { + position:absolute; + top:0; + } + // ab958bc5 - IE6/7 Tweaks + .content { + margin-top:6em; + } + .nav-wrapper { + .nav-wrapper-2 { + position: absolute; + } + } + } +} +// a7a564a - Stevenage IE8 position tweak +// 15591af7 - Stevenage Map page changes +.ie8 { + body.mappage { + #stevenage_cc_header{ + position:absolute; + top:0; + } + .nav-wrapper { + .nav-wrapper-2 { + position: absolute; + } + } + } +} + +// d523b431 +body.fullwidthpage { + .content { + @include box-shadow(none); + background: none; + } +} + +// 4d5998fb - Missed a sticky-sidebar +body.twothirdswidthpage { + .content { + .sticky-sidebar { + aside { + top: 19em; + } + } + } +} + +// 15591af7 - Stevenage Map page changes +#map_box { + top: 140px; +} +#fms_pan_zoom { + top: 190px !important; +} + +// 2a23e09f - Moved menu on map page and reverted to full header. +#report-a-problem-sidebar { + top: 9em; +} + +// d523b431 +body.frontpage { + .nav-wrapper-2 { + height: auto; + } + #site-header { + height: auto; + } + // 1162d5c8 - Changed the colour of the user text when you're logged in to be more readable + #user-meta { + p { + color: #fff; + } + } +} + +// d523b431 +#front-main { + background: #fff; + color: #222; + margin: 0 auto; + margin-top: 1.5em; + max-width: 60em; +} + +// Front page button colour +#front-main { + #postcodeForm { + div { + input#submit { + color: #fff; + background: $primary; + &:hover { + background: lighten($primary, 10%); + } + } + } + } +} + +// 0c5d50bc - Added margin to front page report box to push below nav in IE6/7 +.ie6, .ie7 { + #front-main { + margin-top: 5.5em; + } +} + +@media only screen and (min-width: 48em) and (max-width: 61em) { + // d523b431 + #main-nav { + float: left; + } + .nav-wrapper { + .nav-wrapper-2 { + @include background(linear-gradient(#222, #555 30%, #555 60%, #222)); + } + } + // f432a72d - moved sticky sidebars down a bit to account for the larger header + body.twothirdswidthpage { + .content { + .sticky-sidebar { + aside { + top: 19em; + } + } + } + } +} diff --git a/web/cobrands/zurich/Zurich-WMTSCapabilities.xml b/web/cobrands/zurich/Zurich-WMTSCapabilities.xml new file mode 100644 index 000000000..c8b863c22 --- /dev/null +++ b/web/cobrands/zurich/Zurich-WMTSCapabilities.xml @@ -0,0 +1,178 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<Capabilities xmlns="http://www.opengis.net/wmts/1.0"
+xmlns:ows="http://www.opengis.net/ows/1.1"
+xmlns:xlink="http://www.w3.org/1999/xlink"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns:gml="http://www.opengis.net/gml"
+xsi:schemaLocation="http://www.opengis.net/wmts/1.0 http://schemas.opengis.net/wmts/1.0/wmtsGetCapabilities_response.xsd"
+version="1.0.0">
+<!-- Service Identification --> <ows:ServiceIdentification>
+<ows:Title>Luftbild</ows:Title>
+<ows:ServiceType>OGC WMTS</ows:ServiceType>
+<ows:ServiceTypeVersion>1.0.0</ows:ServiceTypeVersion>
+</ows:ServiceIdentification> <!-- Operations Metadata --> <ows:OperationsMetadata>
+<ows:Operation name="GetCapabilities">
+<ows:DCP>
+<ows:HTTP>
+<ows:Get xlink:href="http://www.wmts.stadt-zuerich.ch/arcgis/rest/services/Luftbild/MapServer/WMTS/1.0.0/WMTSCapabilities.xml">
+<ows:Constraint name="GetEncoding">
+<ows:AllowedValues>
+<ows:Value>RESTful</ows:Value>
+</ows:AllowedValues>
+</ows:Constraint>
+</ows:Get>
+<!-- add KVP binding in 10.1 -->
+<ows:Get xlink:href="http://www.wmts.stadt-zuerich.ch/arcgis/rest/services/Luftbild/MapServer/WMTS?">
+<ows:Constraint name="GetEncoding">
+<ows:AllowedValues>
+<ows:Value>KVP</ows:Value>
+</ows:AllowedValues>
+</ows:Constraint>
+</ows:Get>
+</ows:HTTP>
+</ows:DCP>
+</ows:Operation>
+<ows:Operation name="GetTile">
+<ows:DCP>
+<ows:HTTP>
+<ows:Get xlink:href="http://www.wmts.stadt-zuerich.ch/arcgis/rest/services/Luftbild/MapServer/WMTS/tile/1.0.0/">
+<ows:Constraint name="GetEncoding">
+<ows:AllowedValues>
+<ows:Value>RESTful</ows:Value>
+</ows:AllowedValues>
+</ows:Constraint>
+</ows:Get>
+<ows:Get xlink:href="http://www.wmts.stadt-zuerich.ch/arcgis/rest/services/Luftbild/MapServer/WMTS?">
+<ows:Constraint name="GetEncoding">
+<ows:AllowedValues>
+<ows:Value>KVP</ows:Value>
+</ows:AllowedValues>
+</ows:Constraint>
+</ows:Get>
+</ows:HTTP>
+</ows:DCP>
+</ows:Operation>
+</ows:OperationsMetadata> <Contents>
+<!--Layer--> <Layer>
+<ows:Title>Luftbild</ows:Title> <ows:Identifier>Luftbild</ows:Identifier>
+<ows:BoundingBox crs="urn:ogc:def:crs:EPSG::21781">
+<ows:LowerCorner>676000.0 241000.0</ows:LowerCorner>
+<ows:UpperCorner>690000.0 255000.0</ows:UpperCorner>
+</ows:BoundingBox> <ows:WGS84BoundingBox crs="urn:ogc:def:crs:OGC:2:84">
+<ows:LowerCorner>8.444933818976226 47.31509040172551</ows:LowerCorner>
+<ows:UpperCorner>8.632922236617937 47.442777990747416</ows:UpperCorner>
+</ows:WGS84BoundingBox>
+<Style isDefault="true">
+<ows:Title>Default Style</ows:Title>
+<ows:Identifier>default</ows:Identifier>
+</Style>
+<Format>image/jpgpng</Format>
+<TileMatrixSetLink>
+<TileMatrixSet>default028mm</TileMatrixSet>
+</TileMatrixSetLink>
+<TileMatrixSetLink>
+<TileMatrixSet>nativeTileMatrixSet</TileMatrixSet> </TileMatrixSetLink> <ResourceURL format="image/jpgpng" resourceType="tile" template="http://www.wmts.stadt-zuerich.ch/arcgis/rest/services/Luftbild/MapServer/WMTS/tile/1.0.0/Luftbild/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}" />
+</Layer> <!--TileMatrixSet-->
+<TileMatrixSet>
+<ows:Title>Default TileMatrix using 0.28mm</ows:Title>
+<ows:Abstract>The tile matrix set that has scale values calculated based on the dpi defined by OGC specification (dpi assumes 0.28mm as the physical distance of a pixel).</ows:Abstract> <ows:Identifier>default028mm</ows:Identifier>
+<ows:SupportedCRS>urn:ogc:def:crs:EPSG::21781</ows:SupportedCRS>
+<TileMatrix>
+<ows:Identifier>0</ows:Identifier> <ScaleDenominator>118117.55952380951</ScaleDenominator>
+<TopLeftCorner>-2.93864E7 3.08145E7</TopLeftCorner> <TileWidth>256</TileWidth> <TileHeight>256</TileHeight>
+<MatrixWidth>3</MatrixWidth> <MatrixHeight>3</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>1</ows:Identifier> <ScaleDenominator>60476.19047619047</ScaleDenominator>
+<TopLeftCorner>-2.93864E7 3.08145E7</TopLeftCorner> <TileWidth>256</TileWidth> <TileHeight>256</TileHeight>
+<MatrixWidth>5</MatrixWidth> <MatrixHeight>4</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>2</ows:Identifier> <ScaleDenominator>30238.095238095237</ScaleDenominator>
+<TopLeftCorner>-2.93864E7 3.08145E7</TopLeftCorner> <TileWidth>256</TileWidth> <TileHeight>256</TileHeight>
+<MatrixWidth>8</MatrixWidth> <MatrixHeight>7</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>3</ows:Identifier> <ScaleDenominator>15119.047619047618</ScaleDenominator>
+<TopLeftCorner>-2.93864E7 3.08145E7</TopLeftCorner> <TileWidth>256</TileWidth> <TileHeight>256</TileHeight>
+<MatrixWidth>14</MatrixWidth> <MatrixHeight>14</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>4</ows:Identifier> <ScaleDenominator>7559.523809523809</ScaleDenominator>
+<TopLeftCorner>-2.93864E7 3.08145E7</TopLeftCorner> <TileWidth>256</TileWidth> <TileHeight>256</TileHeight>
+<MatrixWidth>27</MatrixWidth> <MatrixHeight>27</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>5</ows:Identifier> <ScaleDenominator>3779.7619047619046</ScaleDenominator>
+<TopLeftCorner>-2.93864E7 3.08145E7</TopLeftCorner> <TileWidth>256</TileWidth> <TileHeight>256</TileHeight>
+<MatrixWidth>53</MatrixWidth> <MatrixHeight>52</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>6</ows:Identifier> <ScaleDenominator>1889.8809523809523</ScaleDenominator>
+<TopLeftCorner>-2.93864E7 3.08145E7</TopLeftCorner> <TileWidth>256</TileWidth> <TileHeight>256</TileHeight>
+<MatrixWidth>105</MatrixWidth> <MatrixHeight>104</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>7</ows:Identifier> <ScaleDenominator>944.9404761904761</ScaleDenominator>
+<TopLeftCorner>-2.93864E7 3.08145E7</TopLeftCorner> <TileWidth>256</TileWidth> <TileHeight>256</TileHeight>
+<MatrixWidth>208</MatrixWidth> <MatrixHeight>208</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>8</ows:Identifier> <ScaleDenominator>472.4702380952381</ScaleDenominator>
+<TopLeftCorner>-2.93864E7 3.08145E7</TopLeftCorner> <TileWidth>256</TileWidth> <TileHeight>256</TileHeight>
+<MatrixWidth>414</MatrixWidth> <MatrixHeight>415</MatrixHeight>
+</TileMatrix>
+</TileMatrixSet>
+<TileMatrixSet>
+<ows:Title>Native TiledMapService TileMatrixSet</ows:Title>
+<ows:Abstract>the tile matrix set that has scale values calculated based on the dpi defined by ArcGIS Server tiled map service. The current tile dpi is 96</ows:Abstract>
+<ows:Identifier>nativeTileMatrixSet</ows:Identifier>
+<ows:SupportedCRS>urn:ogc:def:crs:EPSG::21781</ows:SupportedCRS>
+<TileMatrix>
+<ows:Identifier>0</ows:Identifier> <ScaleDenominator>125000.0</ScaleDenominator>
+<TopLeftCorner>-2.93864E7 3.08145E7</TopLeftCorner> <TileWidth>256</TileWidth> <TileHeight>256</TileHeight>
+<MatrixWidth>3</MatrixWidth> <MatrixHeight>3</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>1</ows:Identifier> <ScaleDenominator>64000.0</ScaleDenominator>
+<TopLeftCorner>-2.93864E7 3.08145E7</TopLeftCorner> <TileWidth>256</TileWidth> <TileHeight>256</TileHeight>
+<MatrixWidth>5</MatrixWidth> <MatrixHeight>4</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>2</ows:Identifier> <ScaleDenominator>32000.0</ScaleDenominator>
+<TopLeftCorner>-2.93864E7 3.08145E7</TopLeftCorner> <TileWidth>256</TileWidth> <TileHeight>256</TileHeight>
+<MatrixWidth>8</MatrixWidth> <MatrixHeight>7</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>3</ows:Identifier> <ScaleDenominator>16000.0</ScaleDenominator>
+<TopLeftCorner>-2.93864E7 3.08145E7</TopLeftCorner> <TileWidth>256</TileWidth> <TileHeight>256</TileHeight>
+<MatrixWidth>14</MatrixWidth> <MatrixHeight>14</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>4</ows:Identifier> <ScaleDenominator>8000.0</ScaleDenominator>
+<TopLeftCorner>-2.93864E7 3.08145E7</TopLeftCorner> <TileWidth>256</TileWidth> <TileHeight>256</TileHeight>
+<MatrixWidth>27</MatrixWidth> <MatrixHeight>27</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>5</ows:Identifier> <ScaleDenominator>4000.0</ScaleDenominator>
+<TopLeftCorner>-2.93864E7 3.08145E7</TopLeftCorner> <TileWidth>256</TileWidth> <TileHeight>256</TileHeight>
+<MatrixWidth>53</MatrixWidth> <MatrixHeight>52</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>6</ows:Identifier> <ScaleDenominator>2000.0</ScaleDenominator>
+<TopLeftCorner>-2.93864E7 3.08145E7</TopLeftCorner> <TileWidth>256</TileWidth> <TileHeight>256</TileHeight>
+<MatrixWidth>105</MatrixWidth> <MatrixHeight>104</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>7</ows:Identifier> <ScaleDenominator>1000.0</ScaleDenominator>
+<TopLeftCorner>-2.93864E7 3.08145E7</TopLeftCorner> <TileWidth>256</TileWidth> <TileHeight>256</TileHeight>
+<MatrixWidth>208</MatrixWidth> <MatrixHeight>208</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>8</ows:Identifier> <ScaleDenominator>500.0</ScaleDenominator>
+<TopLeftCorner>-2.93864E7 3.08145E7</TopLeftCorner> <TileWidth>256</TileWidth> <TileHeight>256</TileHeight>
+<MatrixWidth>414</MatrixWidth> <MatrixHeight>415</MatrixHeight>
+</TileMatrix>
+</TileMatrixSet>
+</Contents>
+<ServiceMetadataURL xlink:href="http://www.wmts.stadt-zuerich.ch/arcgis/rest/services/Luftbild/MapServer/WMTS/1.0.0/WMTSCapabilities.xml" /> </Capabilities>
diff --git a/web/cobrands/zurich/_colours.scss b/web/cobrands/zurich/_colours.scss index 1a62d0282..8e8f4c9cd 100644 --- a/web/cobrands/zurich/_colours.scss +++ b/web/cobrands/zurich/_colours.scss @@ -1,9 +1,15 @@ /* COLOURS */ -$primary: #FFD000; -$primary_b: #F3B11E; -$primary_text: #222; +$dark_blue: rgb(50, 80, 165); +$lighter_blue: rgb(57, 94, 147); + +$primary: $lighter_blue; +$primary_b: $dark_blue; +$primary_text: #fff; + +$col_click_map: $lighter_blue; +$col_click_map_dark: darken($lighter_blue, 20%); + +$col_fixed_label: #00BD08; +$col_fixed_label_dark: #4B8304; -$contrast1: #00BD08; -$contrast1_dark: #4B8304; -$contrast2: #AA8D11; diff --git a/web/cobrands/zurich/_zurich.scss b/web/cobrands/zurich/_zurich.scss new file mode 100644 index 000000000..b71670a92 --- /dev/null +++ b/web/cobrands/zurich/_zurich.scss @@ -0,0 +1,32 @@ +// Some things from the Zurich stylesheet + +a { + color: #126094; + text-decoration: none; +} +a:hover { + text-decoration: underline; +} + +#zurich-footer { + margin-top: 2em; // mySociety + margin-left: 12px; // mySociety + font-size: 67.5%; + line-height: 1.5em; + clear: both; + background-image: url(bg_mainnav_portal.png); + background-repeat: repeat-x; + border: 1px solid #d8d8d8; + width: 953px; + padding: 3px 10px; + margin-bottom: 24px; + height: 1.5em +} + +#zurich-footer a { + padding-left: 20px; +} + +#zurich-footer a:hover { + color: #3c3c3c; +} diff --git a/web/cobrands/zurich/bg_mainnav_portal.png b/web/cobrands/zurich/bg_mainnav_portal.png Binary files differnew file mode 100644 index 000000000..093ef6304 --- /dev/null +++ b/web/cobrands/zurich/bg_mainnav_portal.png diff --git a/web/cobrands/zurich/layout.scss b/web/cobrands/zurich/layout.scss index abaa25224..82ae2be75 100644 --- a/web/cobrands/zurich/layout.scss +++ b/web/cobrands/zurich/layout.scss @@ -1,3 +1,80 @@ -@import "_colours"; -@import "../fixmystreet/_layout"; +@import "colours"; +@import "../fixmystreet/layout"; +@import "zurich"; + +body { + color: #3c3c3c; + background-color: #fff; +} + +// White background, so no shadow or margin needed. +.content { + color: #3c3c3c; + @include box-shadow(none); +} +.ie6, .ie7, .ie8 { + .content { + border: none; + } +} + +#site-header .container { + height: 83px; + background: url(logo_portal.x.jpg) top left repeat-x; +} + +body.frontpage #site-logo, #site-logo { + width: 415px; + height: 83px; + background: url(logo_portal.jpg) top left no-repeat; + top: 0; +} + +.nav-wrapper { + .nav-wrapper-2 { + border-top: solid 18px white; + } +} + +body.mappage { + .nav-wrapper { + .nav-wrapper-2 { + border-top: none; + padding-top: 18px; + background: url(logo_portal.x.jpg) top left repeat-x; + height: 83px; + } + } +} + +#main-nav { + ul#main-menu { + li { + a:hover { + background: $primary/1.1; + } + span { + color: $primary_text; + } + } + } +} + +body.mappage { + #main-nav ul#main-menu li a, + #main-nav ul#main-menu li span { + padding: 0.75em; + } + #zurich-footer { + display: none; + } +} + +body.twothirdswidthpage { + .content { + aside { + @include box-shadow(none); + } + } +} diff --git a/web/cobrands/zurich/logo_portal.jpg b/web/cobrands/zurich/logo_portal.jpg Binary files differnew file mode 100644 index 000000000..5677285e7 --- /dev/null +++ b/web/cobrands/zurich/logo_portal.jpg diff --git a/web/cobrands/zurich/logo_portal.x.jpg b/web/cobrands/zurich/logo_portal.x.jpg Binary files differnew file mode 100644 index 000000000..c0cfef240 --- /dev/null +++ b/web/cobrands/zurich/logo_portal.x.jpg diff --git a/web/js/OpenLayers.2.11.zurich.js b/web/js/OpenLayers.2.11.zurich.js new file mode 100644 index 000000000..671984fb4 --- /dev/null +++ b/web/js/OpenLayers.2.11.zurich.js @@ -0,0 +1,1384 @@ +/* + + OpenLayers.js -- OpenLayers Map Viewer Library + + Copyright 2005-2011 OpenLayers Contributors, released under the FreeBSD + license. Please see http://svn.openlayers.org/trunk/openlayers/license.txt + for the full text of the license. + + Includes compressed code under the following licenses: + + (For uncompressed versions of the code used please see the + OpenLayers SVN repository: <http://openlayers.org/>) + +*/ + +/* Contains portions of Prototype.js: + * + * Prototype JavaScript framework, version 1.4.0 + * (c) 2005 Sam Stephenson <sam@conio.net> + * + * Prototype is freely distributable under the terms of an MIT-style license. + * For details, see the Prototype web site: http://prototype.conio.net/ + * + *--------------------------------------------------------------------------*/ + +/** +* +* Contains portions of Rico <http://openrico.org/> +* +* Copyright 2005 Sabre Airline Solutions +* +* Licensed under the Apache License, Version 2.0 (the "License"); you +* may not use this file except in compliance with the License. You +* may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +* implied. See the License for the specific language governing +* permissions and limitations under the License. +* +**/ + +/** + * Contains XMLHttpRequest.js <http://code.google.com/p/xmlhttprequest/> + * Copyright 2007 Sergey Ilinsky (http://www.ilinsky.com) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + */ + +/** + * Contains portions of Gears <http://code.google.com/apis/gears/> + * + * Copyright 2007, Google Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * 3. Neither the name of Google Inc. nor the names of its contributors may be + * used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO + * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Sets up google.gears.*, which is *the only* supported way to access Gears. + * + * Circumvent this file at your own risk! + * + * In the future, Gears may automatically define google.gears.* without this + * file. Gears may use these objects to transparently fix bugs and compatibility + * issues. Applications that use the code below will continue to work seamlessly + * when that happens. + */ + +/** + * OpenLayers.Util.pagePosition is based on Yahoo's getXY method, which is + * Copyright (c) 2006, Yahoo! Inc. + * All rights reserved. + * + * Redistribution and use of this software in source and binary forms, with or + * without modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * * Neither the name of Yahoo! Inc. nor the names of its contributors may be + * used to endorse or promote products derived from this software without + * specific prior written permission of Yahoo! Inc. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */var OpenLayers={VERSION_NUMBER:"Release 2.11",singleFile:true,_getScriptLocation:function(){ return "/jslib/OpenLayers-2.10/"; +}};OpenLayers.Class=function(){var len=arguments.length;var P=arguments[0];var F=arguments[len-1];var C=typeof F.initialize=="function"?F.initialize:function(){P.prototype.initialize.apply(this,arguments);};if(len>1){var newArgs=[C,P].concat(Array.prototype.slice.call(arguments).slice(1,len-1),F);OpenLayers.inherit.apply(null,newArgs);}else{C.prototype=F;} +return C;};OpenLayers.Class.isPrototype=function(){};OpenLayers.Class.create=function(){return function(){if(arguments&&arguments[0]!=OpenLayers.Class.isPrototype){this.initialize.apply(this,arguments);}};};OpenLayers.Class.inherit=function(P){var C=function(){P.call(this);};var newArgs=[C].concat(Array.prototype.slice.call(arguments));OpenLayers.inherit.apply(null,newArgs);return C.prototype;};OpenLayers.inherit=function(C,P){var F=function(){};F.prototype=P.prototype;C.prototype=new F;var i,l,o;for(i=2,l=arguments.length;i<l;i++){o=arguments[i];if(typeof o==="function"){o=o.prototype;} +OpenLayers.Util.extend(C.prototype,o);}};OpenLayers.Util=OpenLayers.Util||{};OpenLayers.Util.extend=function(destination,source){destination=destination||{};if(source){for(var property in source){var value=source[property];if(value!==undefined){destination[property]=value;}} +var sourceIsEvt=typeof window.Event=="function"&&source instanceof window.Event;if(!sourceIsEvt&&source.hasOwnProperty&&source.hasOwnProperty("toString")){destination.toString=source.toString;}} +return destination;};OpenLayers.Console={log:function(){},debug:function(){},info:function(){},warn:function(){},error:function(){},userError:function(error){alert(error);},assert:function(){},dir:function(){},dirxml:function(){},trace:function(){},group:function(){},groupEnd:function(){},time:function(){},timeEnd:function(){},profile:function(){},profileEnd:function(){},count:function(){},CLASS_NAME:"OpenLayers.Console"};(function(){var scripts=document.getElementsByTagName("script");for(var i=0,len=scripts.length;i<len;++i){if(scripts[i].src.indexOf("firebug.js")!=-1){if(console){OpenLayers.Util.extend(OpenLayers.Console,console);break;}}}})();OpenLayers.Control=OpenLayers.Class({id:null,map:null,div:null,type:null,allowSelection:false,displayClass:"",title:"",autoActivate:false,active:null,handler:null,eventListeners:null,events:null,EVENT_TYPES:["activate","deactivate"],initialize:function(options){this.displayClass=this.CLASS_NAME.replace("OpenLayers.","ol").replace(/\./g,"");OpenLayers.Util.extend(this,options);this.events=new OpenLayers.Events(this,null,this.EVENT_TYPES);if(this.eventListeners instanceof Object){this.events.on(this.eventListeners);} +if(this.id==null){this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_");}},destroy:function(){if(this.events){if(this.eventListeners){this.events.un(this.eventListeners);} +this.events.destroy();this.events=null;} +this.eventListeners=null;if(this.handler){this.handler.destroy();this.handler=null;} +if(this.handlers){for(var key in this.handlers){if(this.handlers.hasOwnProperty(key)&&typeof this.handlers[key].destroy=="function"){this.handlers[key].destroy();}} +this.handlers=null;} +if(this.map){this.map.removeControl(this);this.map=null;} +this.div=null;},setMap:function(map){this.map=map;if(this.handler){this.handler.setMap(map);}},draw:function(px){if(this.div==null){this.div=OpenLayers.Util.createDiv(this.id);this.div.className=this.displayClass;if(!this.allowSelection){this.div.className+=" olControlNoSelect";this.div.setAttribute("unselectable","on",0);this.div.onselectstart=OpenLayers.Function.False;} +if(this.title!=""){this.div.title=this.title;}} +if(px!=null){this.position=px.clone();} +this.moveTo(this.position);return this.div;},moveTo:function(px){if((px!=null)&&(this.div!=null)){this.div.style.left=px.x+"px";this.div.style.top=px.y+"px";}},activate:function(){if(this.active){return false;} +if(this.handler){this.handler.activate();} +this.active=true;if(this.map){OpenLayers.Element.addClass(this.map.viewPortDiv,this.displayClass.replace(/ /g,"")+"Active");} +this.events.triggerEvent("activate");return true;},deactivate:function(){if(this.active){if(this.handler){this.handler.deactivate();} +this.active=false;if(this.map){OpenLayers.Element.removeClass(this.map.viewPortDiv,this.displayClass.replace(/ /g,"")+"Active");} +this.events.triggerEvent("deactivate");return true;} +return false;},CLASS_NAME:"OpenLayers.Control"});OpenLayers.Control.TYPE_BUTTON=1;OpenLayers.Control.TYPE_TOGGLE=2;OpenLayers.Control.TYPE_TOOL=3;OpenLayers.Lang={code:null,defaultCode:"en",getCode:function(){if(!OpenLayers.Lang.code){OpenLayers.Lang.setCode();} +return OpenLayers.Lang.code;},setCode:function(code){var lang;if(!code){code=(OpenLayers.BROWSER_NAME=="msie")?navigator.userLanguage:navigator.language;} +var parts=code.split('-');parts[0]=parts[0].toLowerCase();if(typeof OpenLayers.Lang[parts[0]]=="object"){lang=parts[0];} +if(parts[1]){var testLang=parts[0]+'-'+parts[1].toUpperCase();if(typeof OpenLayers.Lang[testLang]=="object"){lang=testLang;}} +if(!lang){OpenLayers.Console.warn('Failed to find OpenLayers.Lang.'+parts.join("-")+' dictionary, falling back to default language');lang=OpenLayers.Lang.defaultCode;} +OpenLayers.Lang.code=lang;},translate:function(key,context){var dictionary=OpenLayers.Lang[OpenLayers.Lang.getCode()];var message=dictionary&&dictionary[key];if(!message){message=key;} +if(context){message=OpenLayers.String.format(message,context);} +return message;}};OpenLayers.i18n=OpenLayers.Lang.translate;OpenLayers.String={startsWith:function(str,sub){return(str.indexOf(sub)==0);},contains:function(str,sub){return(str.indexOf(sub)!=-1);},trim:function(str){return str.replace(/^\s\s*/,'').replace(/\s\s*$/,'');},camelize:function(str){var oStringList=str.split('-');var camelizedString=oStringList[0];for(var i=1,len=oStringList.length;i<len;i++){var s=oStringList[i];camelizedString+=s.charAt(0).toUpperCase()+s.substring(1);} +return camelizedString;},format:function(template,context,args){if(!context){context=window;} +var replacer=function(str,match){var replacement;var subs=match.split(/\.+/);for(var i=0;i<subs.length;i++){if(i==0){replacement=context;} +replacement=replacement[subs[i]];} +if(typeof replacement=="function"){replacement=args?replacement.apply(null,args):replacement();} +if(typeof replacement=='undefined'){return'undefined';}else{return replacement;}};return template.replace(OpenLayers.String.tokenRegEx,replacer);},tokenRegEx:/\$\{([\w.]+?)\}/g,numberRegEx:/^([+-]?)(?=\d|\.\d)\d*(\.\d*)?([Ee]([+-]?\d+))?$/,isNumeric:function(value){return OpenLayers.String.numberRegEx.test(value);},numericIf:function(value){return OpenLayers.String.isNumeric(value)?parseFloat(value):value;}};if(!String.prototype.startsWith){String.prototype.startsWith=function(sStart){OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",{'newMethod':'OpenLayers.String.startsWith'}));return OpenLayers.String.startsWith(this,sStart);};} +if(!String.prototype.contains){String.prototype.contains=function(str){OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",{'newMethod':'OpenLayers.String.contains'}));return OpenLayers.String.contains(this,str);};} +if(!String.prototype.trim){String.prototype.trim=function(){OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",{'newMethod':'OpenLayers.String.trim'}));return OpenLayers.String.trim(this);};} +if(!String.prototype.camelize){String.prototype.camelize=function(){OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",{'newMethod':'OpenLayers.String.camelize'}));return OpenLayers.String.camelize(this);};} +OpenLayers.Number={decimalSeparator:".",thousandsSeparator:",",limitSigDigs:function(num,sig){var fig=0;if(sig>0){fig=parseFloat(num.toPrecision(sig));} +return fig;},format:function(num,dec,tsep,dsep){dec=(typeof dec!="undefined")?dec:0;tsep=(typeof tsep!="undefined")?tsep:OpenLayers.Number.thousandsSeparator;dsep=(typeof dsep!="undefined")?dsep:OpenLayers.Number.decimalSeparator;if(dec!=null){num=parseFloat(num.toFixed(dec));} +var parts=num.toString().split(".");if(parts.length==1&&dec==null){dec=0;} +var integer=parts[0];if(tsep){var thousands=/(-?[0-9]+)([0-9]{3})/;while(thousands.test(integer)){integer=integer.replace(thousands,"$1"+tsep+"$2");}} +var str;if(dec==0){str=integer;}else{var rem=parts.length>1?parts[1]:"0";if(dec!=null){rem=rem+new Array(dec-rem.length+1).join("0");} +str=integer+dsep+rem;} +return str;}};if(!Number.prototype.limitSigDigs){Number.prototype.limitSigDigs=function(sig){OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",{'newMethod':'OpenLayers.Number.limitSigDigs'}));return OpenLayers.Number.limitSigDigs(this,sig);};} +OpenLayers.Function={bind:function(func,object){var args=Array.prototype.slice.apply(arguments,[2]);return function(){var newArgs=args.concat(Array.prototype.slice.apply(arguments,[0]));return func.apply(object,newArgs);};},bindAsEventListener:function(func,object){return function(event){return func.call(object,event||window.event);};},False:function(){return false;},True:function(){return true;},Void:function(){}};if(!Function.prototype.bind){Function.prototype.bind=function(){OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",{'newMethod':'OpenLayers.Function.bind'}));Array.prototype.unshift.apply(arguments,[this]);return OpenLayers.Function.bind.apply(null,arguments);};} +if(!Function.prototype.bindAsEventListener){Function.prototype.bindAsEventListener=function(object){OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",{'newMethod':'OpenLayers.Function.bindAsEventListener'}));return OpenLayers.Function.bindAsEventListener(this,object);};} +OpenLayers.Array={filter:function(array,callback,caller){var selected=[];if(Array.prototype.filter){selected=array.filter(callback,caller);}else{var len=array.length;if(typeof callback!="function"){throw new TypeError();} +for(var i=0;i<len;i++){if(i in array){var val=array[i];if(callback.call(caller,val,i,array)){selected.push(val);}}}} +return selected;}};OpenLayers.Bounds=OpenLayers.Class({left:null,bottom:null,right:null,top:null,centerLonLat:null,initialize:function(left,bottom,right,top){if(left!=null){this.left=OpenLayers.Util.toFloat(left);} +if(bottom!=null){this.bottom=OpenLayers.Util.toFloat(bottom);} +if(right!=null){this.right=OpenLayers.Util.toFloat(right);} +if(top!=null){this.top=OpenLayers.Util.toFloat(top);}},clone:function(){return new OpenLayers.Bounds(this.left,this.bottom,this.right,this.top);},equals:function(bounds){var equals=false;if(bounds!=null){equals=((this.left==bounds.left)&&(this.right==bounds.right)&&(this.top==bounds.top)&&(this.bottom==bounds.bottom));} +return equals;},toString:function(){return[this.left,this.bottom,this.right,this.top].join(",");},toArray:function(reverseAxisOrder){if(reverseAxisOrder===true){return[this.bottom,this.left,this.top,this.right];}else{return[this.left,this.bottom,this.right,this.top];}},toBBOX:function(decimal,reverseAxisOrder){if(decimal==null){decimal=6;} +var mult=Math.pow(10,decimal);var xmin=Math.round(this.left*mult)/mult;var ymin=Math.round(this.bottom*mult)/mult;var xmax=Math.round(this.right*mult)/mult;var ymax=Math.round(this.top*mult)/mult;if(reverseAxisOrder===true){return ymin+","+xmin+","+ymax+","+xmax;}else{return xmin+","+ymin+","+xmax+","+ymax;}},toGeometry:function(){return new OpenLayers.Geometry.Polygon([new OpenLayers.Geometry.LinearRing([new OpenLayers.Geometry.Point(this.left,this.bottom),new OpenLayers.Geometry.Point(this.right,this.bottom),new OpenLayers.Geometry.Point(this.right,this.top),new OpenLayers.Geometry.Point(this.left,this.top)])]);},getWidth:function(){return(this.right-this.left);},getHeight:function(){return(this.top-this.bottom);},getSize:function(){return new OpenLayers.Size(this.getWidth(),this.getHeight());},getCenterPixel:function(){return new OpenLayers.Pixel((this.left+this.right)/2,(this.bottom+this.top)/2);},getCenterLonLat:function(){if(!this.centerLonLat){this.centerLonLat=new OpenLayers.LonLat((this.left+this.right)/2,(this.bottom+this.top)/2);} +return this.centerLonLat;},scale:function(ratio,origin){if(origin==null){origin=this.getCenterLonLat();} +var origx,origy;if(origin.CLASS_NAME=="OpenLayers.LonLat"){origx=origin.lon;origy=origin.lat;}else{origx=origin.x;origy=origin.y;} +var left=(this.left-origx)*ratio+origx;var bottom=(this.bottom-origy)*ratio+origy;var right=(this.right-origx)*ratio+origx;var top=(this.top-origy)*ratio+origy;return new OpenLayers.Bounds(left,bottom,right,top);},add:function(x,y){if((x==null)||(y==null)){var msg=OpenLayers.i18n("boundsAddError");OpenLayers.Console.error(msg);return null;} +return new OpenLayers.Bounds(this.left+x,this.bottom+y,this.right+x,this.top+y);},extend:function(object){var bounds=null;if(object){switch(object.CLASS_NAME){case"OpenLayers.LonLat":bounds=new OpenLayers.Bounds(object.lon,object.lat,object.lon,object.lat);break;case"OpenLayers.Geometry.Point":bounds=new OpenLayers.Bounds(object.x,object.y,object.x,object.y);break;case"OpenLayers.Bounds":bounds=object;break;} +if(bounds){this.centerLonLat=null;if((this.left==null)||(bounds.left<this.left)){this.left=bounds.left;} +if((this.bottom==null)||(bounds.bottom<this.bottom)){this.bottom=bounds.bottom;} +if((this.right==null)||(bounds.right>this.right)){this.right=bounds.right;} +if((this.top==null)||(bounds.top>this.top)){this.top=bounds.top;}}}},containsLonLat:function(ll,inclusive){return this.contains(ll.lon,ll.lat,inclusive);},containsPixel:function(px,inclusive){return this.contains(px.x,px.y,inclusive);},contains:function(x,y,inclusive){if(inclusive==null){inclusive=true;} +if(x==null||y==null){return false;} +x=OpenLayers.Util.toFloat(x);y=OpenLayers.Util.toFloat(y);var contains=false;if(inclusive){contains=((x>=this.left)&&(x<=this.right)&&(y>=this.bottom)&&(y<=this.top));}else{contains=((x>this.left)&&(x<this.right)&&(y>this.bottom)&&(y<this.top));} +return contains;},intersectsBounds:function(bounds,inclusive){if(inclusive==null){inclusive=true;} +var intersects=false;var mightTouch=(this.left==bounds.right||this.right==bounds.left||this.top==bounds.bottom||this.bottom==bounds.top);if(inclusive||!mightTouch){var inBottom=(((bounds.bottom>=this.bottom)&&(bounds.bottom<=this.top))||((this.bottom>=bounds.bottom)&&(this.bottom<=bounds.top)));var inTop=(((bounds.top>=this.bottom)&&(bounds.top<=this.top))||((this.top>bounds.bottom)&&(this.top<bounds.top)));var inLeft=(((bounds.left>=this.left)&&(bounds.left<=this.right))||((this.left>=bounds.left)&&(this.left<=bounds.right)));var inRight=(((bounds.right>=this.left)&&(bounds.right<=this.right))||((this.right>=bounds.left)&&(this.right<=bounds.right)));intersects=((inBottom||inTop)&&(inLeft||inRight));} +return intersects;},containsBounds:function(bounds,partial,inclusive){if(partial==null){partial=false;} +if(inclusive==null){inclusive=true;} +var bottomLeft=this.contains(bounds.left,bounds.bottom,inclusive);var bottomRight=this.contains(bounds.right,bounds.bottom,inclusive);var topLeft=this.contains(bounds.left,bounds.top,inclusive);var topRight=this.contains(bounds.right,bounds.top,inclusive);return(partial)?(bottomLeft||bottomRight||topLeft||topRight):(bottomLeft&&bottomRight&&topLeft&&topRight);},determineQuadrant:function(lonlat){var quadrant="";var center=this.getCenterLonLat();quadrant+=(lonlat.lat<center.lat)?"b":"t";quadrant+=(lonlat.lon<center.lon)?"l":"r";return quadrant;},transform:function(source,dest){this.centerLonLat=null;var ll=OpenLayers.Projection.transform({'x':this.left,'y':this.bottom},source,dest);var lr=OpenLayers.Projection.transform({'x':this.right,'y':this.bottom},source,dest);var ul=OpenLayers.Projection.transform({'x':this.left,'y':this.top},source,dest);var ur=OpenLayers.Projection.transform({'x':this.right,'y':this.top},source,dest);this.left=Math.min(ll.x,ul.x);this.bottom=Math.min(ll.y,lr.y);this.right=Math.max(lr.x,ur.x);this.top=Math.max(ul.y,ur.y);return this;},wrapDateLine:function(maxExtent,options){options=options||{};var leftTolerance=options.leftTolerance||0;var rightTolerance=options.rightTolerance||0;var newBounds=this.clone();if(maxExtent){while(newBounds.left<maxExtent.left&&(newBounds.right-rightTolerance)<=maxExtent.left){newBounds=newBounds.add(maxExtent.getWidth(),0);} +while((newBounds.left+leftTolerance)>=maxExtent.right&&newBounds.right>maxExtent.right){newBounds=newBounds.add(-maxExtent.getWidth(),0);}} +return newBounds;},CLASS_NAME:"OpenLayers.Bounds"});OpenLayers.Bounds.fromString=function(str,reverseAxisOrder){var bounds=str.split(",");return OpenLayers.Bounds.fromArray(bounds,reverseAxisOrder);};OpenLayers.Bounds.fromArray=function(bbox,reverseAxisOrder){return reverseAxisOrder===true?new OpenLayers.Bounds(parseFloat(bbox[1]),parseFloat(bbox[0]),parseFloat(bbox[3]),parseFloat(bbox[2])):new OpenLayers.Bounds(parseFloat(bbox[0]),parseFloat(bbox[1]),parseFloat(bbox[2]),parseFloat(bbox[3]));};OpenLayers.Bounds.fromSize=function(size){return new OpenLayers.Bounds(0,size.h,size.w,0);};OpenLayers.Bounds.oppositeQuadrant=function(quadrant){var opp="";opp+=(quadrant.charAt(0)=='t')?'b':'t';opp+=(quadrant.charAt(1)=='l')?'r':'l';return opp;};OpenLayers.Element={visible:function(element){return OpenLayers.Util.getElement(element).style.display!='none';},toggle:function(){for(var i=0,len=arguments.length;i<len;i++){var element=OpenLayers.Util.getElement(arguments[i]);var display=OpenLayers.Element.visible(element)?'hide':'show';OpenLayers.Element[display](element);}},hide:function(){OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",{newMethod:"element.style.display = 'none';"}));for(var i=0,len=arguments.length;i<len;i++){var element=OpenLayers.Util.getElement(arguments[i]);if(element){element.style.display='none';}}},show:function(){OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",{newMethod:"element.style.display = '';"}));for(var i=0,len=arguments.length;i<len;i++){var element=OpenLayers.Util.getElement(arguments[i]);if(element){element.style.display='';}}},remove:function(element){element=OpenLayers.Util.getElement(element);element.parentNode.removeChild(element);},getHeight:function(element){element=OpenLayers.Util.getElement(element);return element.offsetHeight;},getDimensions:function(element){element=OpenLayers.Util.getElement(element);if(OpenLayers.Element.getStyle(element,'display')!='none'){return{width:element.offsetWidth,height:element.offsetHeight};} +var els=element.style;var originalVisibility=els.visibility;var originalPosition=els.position;var originalDisplay=els.display;els.visibility='hidden';els.position='absolute';els.display='';var originalWidth=element.clientWidth;var originalHeight=element.clientHeight;els.display=originalDisplay;els.position=originalPosition;els.visibility=originalVisibility;return{width:originalWidth,height:originalHeight};},hasClass:function(element,name){var names=element.className;return(!!names&&new RegExp("(^|\\s)"+name+"(\\s|$)").test(names));},addClass:function(element,name){if(!OpenLayers.Element.hasClass(element,name)){element.className+=(element.className?" ":"")+name;} +return element;},removeClass:function(element,name){var names=element.className;if(names){element.className=OpenLayers.String.trim(names.replace(new RegExp("(^|\\s+)"+name+"(\\s+|$)")," "));} +return element;},toggleClass:function(element,name){if(OpenLayers.Element.hasClass(element,name)){OpenLayers.Element.removeClass(element,name);}else{OpenLayers.Element.addClass(element,name);} +return element;},getStyle:function(element,style){element=OpenLayers.Util.getElement(element);var value=null;if(element&&element.style){value=element.style[OpenLayers.String.camelize(style)];if(!value){if(document.defaultView&&document.defaultView.getComputedStyle){var css=document.defaultView.getComputedStyle(element,null);value=css?css.getPropertyValue(style):null;}else if(element.currentStyle){value=element.currentStyle[OpenLayers.String.camelize(style)];}} +var positions=['left','top','right','bottom'];if(window.opera&&(OpenLayers.Util.indexOf(positions,style)!=-1)&&(OpenLayers.Element.getStyle(element,'position')=='static')){value='auto';}} +return value=='auto'?null:value;}};OpenLayers.LonLat=OpenLayers.Class({lon:0.0,lat:0.0,initialize:function(lon,lat){this.lon=OpenLayers.Util.toFloat(lon);this.lat=OpenLayers.Util.toFloat(lat);},toString:function(){return("lon="+this.lon+",lat="+this.lat);},toShortString:function(){return(this.lon+", "+this.lat);},clone:function(){return new OpenLayers.LonLat(this.lon,this.lat);},add:function(lon,lat){if((lon==null)||(lat==null)){var msg=OpenLayers.i18n("lonlatAddError");OpenLayers.Console.error(msg);return null;} +return new OpenLayers.LonLat(this.lon+OpenLayers.Util.toFloat(lon),this.lat+OpenLayers.Util.toFloat(lat));},equals:function(ll){var equals=false;if(ll!=null){equals=((this.lon==ll.lon&&this.lat==ll.lat)||(isNaN(this.lon)&&isNaN(this.lat)&&isNaN(ll.lon)&&isNaN(ll.lat)));} +return equals;},transform:function(source,dest){var point=OpenLayers.Projection.transform({'x':this.lon,'y':this.lat},source,dest);this.lon=point.x;this.lat=point.y;return this;},wrapDateLine:function(maxExtent){var newLonLat=this.clone();if(maxExtent){while(newLonLat.lon<maxExtent.left){newLonLat.lon+=maxExtent.getWidth();} +while(newLonLat.lon>maxExtent.right){newLonLat.lon-=maxExtent.getWidth();}} +return newLonLat;},CLASS_NAME:"OpenLayers.LonLat"});OpenLayers.LonLat.fromString=function(str){var pair=str.split(",");return new OpenLayers.LonLat(pair[0],pair[1]);};OpenLayers.LonLat.fromArray=function(arr){var gotArr=OpenLayers.Util.isArray(arr),lon=gotArr&&arr[0],lat=gotArr&&arr[1];return new OpenLayers.LonLat(lon,lat);};OpenLayers.Pixel=OpenLayers.Class({x:0.0,y:0.0,initialize:function(x,y){this.x=parseFloat(x);this.y=parseFloat(y);},toString:function(){return("x="+this.x+",y="+this.y);},clone:function(){return new OpenLayers.Pixel(this.x,this.y);},equals:function(px){var equals=false;if(px!=null){equals=((this.x==px.x&&this.y==px.y)||(isNaN(this.x)&&isNaN(this.y)&&isNaN(px.x)&&isNaN(px.y)));} +return equals;},distanceTo:function(px){return Math.sqrt(Math.pow(this.x-px.x,2)+ +Math.pow(this.y-px.y,2));},add:function(x,y){if((x==null)||(y==null)){var msg=OpenLayers.i18n("pixelAddError");OpenLayers.Console.error(msg);return null;} +return new OpenLayers.Pixel(this.x+x,this.y+y);},offset:function(px){var newPx=this.clone();if(px){newPx=this.add(px.x,px.y);} +return newPx;},CLASS_NAME:"OpenLayers.Pixel"});OpenLayers.Size=OpenLayers.Class({w:0.0,h:0.0,initialize:function(w,h){this.w=parseFloat(w);this.h=parseFloat(h);},toString:function(){return("w="+this.w+",h="+this.h);},clone:function(){return new OpenLayers.Size(this.w,this.h);},equals:function(sz){var equals=false;if(sz!=null){equals=((this.w==sz.w&&this.h==sz.h)||(isNaN(this.w)&&isNaN(this.h)&&isNaN(sz.w)&&isNaN(sz.h)));} +return equals;},CLASS_NAME:"OpenLayers.Size"});OpenLayers.Util=OpenLayers.Util||{};OpenLayers.Util.getElement=function(){var elements=[];for(var i=0,len=arguments.length;i<len;i++){var element=arguments[i];if(typeof element=='string'){element=document.getElementById(element);} +if(arguments.length==1){return element;} +elements.push(element);} +return elements;};OpenLayers.Util.isElement=function(o){return!!(o&&o.nodeType===1);};OpenLayers.Util.isArray=function(a){return(Object.prototype.toString.call(a)==='[object Array]');};if(typeof window.$==="undefined"){window.$=OpenLayers.Util.getElement;} +OpenLayers.Util.removeItem=function(array,item){for(var i=array.length-1;i>=0;i--){if(array[i]==item){array.splice(i,1);}} +return array;};OpenLayers.Util.clearArray=function(array){OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",{'newMethod':'array = []'}));array.length=0;};OpenLayers.Util.indexOf=function(array,obj){if(typeof array.indexOf=="function"){return array.indexOf(obj);}else{for(var i=0,len=array.length;i<len;i++){if(array[i]==obj){return i;}} +return-1;}};OpenLayers.Util.modifyDOMElement=function(element,id,px,sz,position,border,overflow,opacity){if(id){element.id=id;} +if(px){element.style.left=px.x+"px";element.style.top=px.y+"px";} +if(sz){element.style.width=sz.w+"px";element.style.height=sz.h+"px";} +if(position){element.style.position=position;} +if(border){element.style.border=border;} +if(overflow){element.style.overflow=overflow;} +if(parseFloat(opacity)>=0.0&&parseFloat(opacity)<1.0){element.style.filter='alpha(opacity='+(opacity*100)+')';element.style.opacity=opacity;}else if(parseFloat(opacity)==1.0){element.style.filter='';element.style.opacity='';}};OpenLayers.Util.createDiv=function(id,px,sz,imgURL,position,border,overflow,opacity){var dom=document.createElement('div');if(imgURL){dom.style.backgroundImage='url('+imgURL+')';} +if(!id){id=OpenLayers.Util.createUniqueID("OpenLayersDiv");} +if(!position){position="absolute";} +OpenLayers.Util.modifyDOMElement(dom,id,px,sz,position,border,overflow,opacity);return dom;};OpenLayers.Util.createImage=function(id,px,sz,imgURL,position,border,opacity,delayDisplay){var image=document.createElement("img");if(!id){id=OpenLayers.Util.createUniqueID("OpenLayersDiv");} +if(!position){position="relative";} +OpenLayers.Util.modifyDOMElement(image,id,px,sz,position,border,null,opacity);if(delayDisplay){image.style.display="none";OpenLayers.Event.observe(image,"load",OpenLayers.Function.bind(OpenLayers.Util.onImageLoad,image));OpenLayers.Event.observe(image,"error",OpenLayers.Function.bind(OpenLayers.Util.onImageLoadError,image));} +image.style.alt=id;image.galleryImg="no";if(imgURL){image.src=imgURL;} +return image;};OpenLayers.Util.setOpacity=function(element,opacity){OpenLayers.Util.modifyDOMElement(element,null,null,null,null,null,null,opacity);};OpenLayers.Util.onImageLoad=function(){if(!this.viewRequestID||(this.map&&this.viewRequestID==this.map.viewRequestID)){this.style.display="";} +OpenLayers.Element.removeClass(this,"olImageLoadError");};OpenLayers.IMAGE_RELOAD_ATTEMPTS=0;OpenLayers.Util.onImageLoadError=function(){this._attempts=(this._attempts)?(this._attempts+1):1;if(this._attempts<=OpenLayers.IMAGE_RELOAD_ATTEMPTS){var urls=this.urls;if(urls&&OpenLayers.Util.isArray(urls)&&urls.length>1){var src=this.src.toString();var current_url,k;for(k=0;current_url=urls[k];k++){if(src.indexOf(current_url)!=-1){break;}} +var guess=Math.floor(urls.length*Math.random());var new_url=urls[guess];k=0;while(new_url==current_url&&k++<4){guess=Math.floor(urls.length*Math.random());new_url=urls[guess];} +this.src=src.replace(current_url,new_url);}else{this.src=this.src;}}else{OpenLayers.Element.addClass(this,"olImageLoadError");} +this.style.display="";};OpenLayers.Util.alphaHackNeeded=null;OpenLayers.Util.alphaHack=function(){if(OpenLayers.Util.alphaHackNeeded==null){var arVersion=navigator.appVersion.split("MSIE");var version=parseFloat(arVersion[1]);var filter=false;try{filter=!!(document.body.filters);}catch(e){} +OpenLayers.Util.alphaHackNeeded=(filter&&(version>=5.5)&&(version<7));} +return OpenLayers.Util.alphaHackNeeded;};OpenLayers.Util.modifyAlphaImageDiv=function(div,id,px,sz,imgURL,position,border,sizing,opacity){OpenLayers.Util.modifyDOMElement(div,id,px,sz,position,null,null,opacity);var img=div.childNodes[0];if(imgURL){img.src=imgURL;} +OpenLayers.Util.modifyDOMElement(img,div.id+"_innerImage",null,sz,"relative",border);if(OpenLayers.Util.alphaHack()){if(div.style.display!="none"){div.style.display="inline-block";} +if(sizing==null){sizing="scale";} +div.style.filter="progid:DXImageTransform.Microsoft"+".AlphaImageLoader(src='"+img.src+"', "+"sizingMethod='"+sizing+"')";if(parseFloat(div.style.opacity)>=0.0&&parseFloat(div.style.opacity)<1.0){div.style.filter+=" alpha(opacity="+div.style.opacity*100+")";} +img.style.filter="alpha(opacity=0)";}};OpenLayers.Util.createAlphaImageDiv=function(id,px,sz,imgURL,position,border,sizing,opacity,delayDisplay){var div=OpenLayers.Util.createDiv();var img=OpenLayers.Util.createImage(null,null,null,null,null,null,null,false);div.appendChild(img);if(delayDisplay){img.style.display="none";OpenLayers.Event.observe(img,"load",OpenLayers.Function.bind(OpenLayers.Util.onImageLoad,div));OpenLayers.Event.observe(img,"error",OpenLayers.Function.bind(OpenLayers.Util.onImageLoadError,div));} +OpenLayers.Util.modifyAlphaImageDiv(div,id,px,sz,imgURL,position,border,sizing,opacity);return div;};OpenLayers.Util.upperCaseObject=function(object){var uObject={};for(var key in object){uObject[key.toUpperCase()]=object[key];} +return uObject;};OpenLayers.Util.applyDefaults=function(to,from){to=to||{};var fromIsEvt=typeof window.Event=="function"&&from instanceof window.Event;for(var key in from){if(to[key]===undefined||(!fromIsEvt&&from.hasOwnProperty&&from.hasOwnProperty(key)&&!to.hasOwnProperty(key))){to[key]=from[key];}} +if(!fromIsEvt&&from&&from.hasOwnProperty&&from.hasOwnProperty('toString')&&!to.hasOwnProperty('toString')){to.toString=from.toString;} +return to;};OpenLayers.Util.getParameterString=function(params){var paramsArray=[];for(var key in params){var value=params[key];if((value!=null)&&(typeof value!='function')){var encodedValue;if(typeof value=='object'&&value.constructor==Array){var encodedItemArray=[];var item;for(var itemIndex=0,len=value.length;itemIndex<len;itemIndex++){item=value[itemIndex];encodedItemArray.push(encodeURIComponent((item===null||item===undefined)?"":item));} +encodedValue=encodedItemArray.join(",");} +else{encodedValue=encodeURIComponent(value);} +paramsArray.push(encodeURIComponent(key)+"="+encodedValue);}} +return paramsArray.join("&");};OpenLayers.Util.urlAppend=function(url,paramStr){var newUrl=url;if(paramStr){var parts=(url+" ").split(/[?&]/);newUrl+=(parts.pop()===" "?paramStr:parts.length?"&"+paramStr:"?"+paramStr);} +return newUrl;};OpenLayers.ImgPath='';OpenLayers.Util.getImagesLocation=function(){return OpenLayers.ImgPath||(OpenLayers._getScriptLocation()+"img/");};OpenLayers.Util.Try=function(){var returnValue=null;for(var i=0,len=arguments.length;i<len;i++){var lambda=arguments[i];try{returnValue=lambda();break;}catch(e){}} +return returnValue;};OpenLayers.Util.getXmlNodeValue=function(node){var val=null;OpenLayers.Util.Try(function(){val=node.text;if(!val){val=node.textContent;} +if(!val){val=node.firstChild.nodeValue;}},function(){val=node.textContent;});return val;};OpenLayers.Util.mouseLeft=function(evt,div){var target=(evt.relatedTarget)?evt.relatedTarget:evt.toElement;while(target!=div&&target!=null){target=target.parentNode;} +return(target!=div);};OpenLayers.Util.DEFAULT_PRECISION=14;OpenLayers.Util.toFloat=function(number,precision){if(precision==null){precision=OpenLayers.Util.DEFAULT_PRECISION;} +if(typeof number!=="number"){number=parseFloat(number);} +return precision===0?number:parseFloat(number.toPrecision(precision));};OpenLayers.Util.rad=function(x){return x*Math.PI/180;};OpenLayers.Util.deg=function(x){return x*180/Math.PI;};OpenLayers.Util.VincentyConstants={a:6378137,b:6356752.3142,f:1/298.257223563};OpenLayers.Util.distVincenty=function(p1,p2){var ct=OpenLayers.Util.VincentyConstants;var a=ct.a,b=ct.b,f=ct.f;var L=OpenLayers.Util.rad(p2.lon-p1.lon);var U1=Math.atan((1-f)*Math.tan(OpenLayers.Util.rad(p1.lat)));var U2=Math.atan((1-f)*Math.tan(OpenLayers.Util.rad(p2.lat)));var sinU1=Math.sin(U1),cosU1=Math.cos(U1);var sinU2=Math.sin(U2),cosU2=Math.cos(U2);var lambda=L,lambdaP=2*Math.PI;var iterLimit=20;while(Math.abs(lambda-lambdaP)>1e-12&&--iterLimit>0){var sinLambda=Math.sin(lambda),cosLambda=Math.cos(lambda);var sinSigma=Math.sqrt((cosU2*sinLambda)*(cosU2*sinLambda)+ +(cosU1*sinU2-sinU1*cosU2*cosLambda)*(cosU1*sinU2-sinU1*cosU2*cosLambda));if(sinSigma==0){return 0;} +var cosSigma=sinU1*sinU2+cosU1*cosU2*cosLambda;var sigma=Math.atan2(sinSigma,cosSigma);var alpha=Math.asin(cosU1*cosU2*sinLambda/sinSigma);var cosSqAlpha=Math.cos(alpha)*Math.cos(alpha);var cos2SigmaM=cosSigma-2*sinU1*sinU2/cosSqAlpha;var C=f/16*cosSqAlpha*(4+f*(4-3*cosSqAlpha));lambdaP=lambda;lambda=L+(1-C)*f*Math.sin(alpha)*(sigma+C*sinSigma*(cos2SigmaM+C*cosSigma*(-1+2*cos2SigmaM*cos2SigmaM)));} +if(iterLimit==0){return NaN;} +var uSq=cosSqAlpha*(a*a-b*b)/(b*b);var A=1+uSq/16384*(4096+uSq*(-768+uSq*(320-175*uSq)));var B=uSq/1024*(256+uSq*(-128+uSq*(74-47*uSq)));var deltaSigma=B*sinSigma*(cos2SigmaM+B/4*(cosSigma*(-1+2*cos2SigmaM*cos2SigmaM)- +B/6*cos2SigmaM*(-3+4*sinSigma*sinSigma)*(-3+4*cos2SigmaM*cos2SigmaM)));var s=b*A*(sigma-deltaSigma);var d=s.toFixed(3)/1000;return d;};OpenLayers.Util.destinationVincenty=function(lonlat,brng,dist){var u=OpenLayers.Util;var ct=u.VincentyConstants;var a=ct.a,b=ct.b,f=ct.f;var lon1=lonlat.lon;var lat1=lonlat.lat;var s=dist;var alpha1=u.rad(brng);var sinAlpha1=Math.sin(alpha1);var cosAlpha1=Math.cos(alpha1);var tanU1=(1-f)*Math.tan(u.rad(lat1));var cosU1=1/Math.sqrt((1+tanU1*tanU1)),sinU1=tanU1*cosU1;var sigma1=Math.atan2(tanU1,cosAlpha1);var sinAlpha=cosU1*sinAlpha1;var cosSqAlpha=1-sinAlpha*sinAlpha;var uSq=cosSqAlpha*(a*a-b*b)/(b*b);var A=1+uSq/16384*(4096+uSq*(-768+uSq*(320-175*uSq)));var B=uSq/1024*(256+uSq*(-128+uSq*(74-47*uSq)));var sigma=s/(b*A),sigmaP=2*Math.PI;while(Math.abs(sigma-sigmaP)>1e-12){var cos2SigmaM=Math.cos(2*sigma1+sigma);var sinSigma=Math.sin(sigma);var cosSigma=Math.cos(sigma);var deltaSigma=B*sinSigma*(cos2SigmaM+B/4*(cosSigma*(-1+2*cos2SigmaM*cos2SigmaM)- +B/6*cos2SigmaM*(-3+4*sinSigma*sinSigma)*(-3+4*cos2SigmaM*cos2SigmaM)));sigmaP=sigma;sigma=s/(b*A)+deltaSigma;} +var tmp=sinU1*sinSigma-cosU1*cosSigma*cosAlpha1;var lat2=Math.atan2(sinU1*cosSigma+cosU1*sinSigma*cosAlpha1,(1-f)*Math.sqrt(sinAlpha*sinAlpha+tmp*tmp));var lambda=Math.atan2(sinSigma*sinAlpha1,cosU1*cosSigma-sinU1*sinSigma*cosAlpha1);var C=f/16*cosSqAlpha*(4+f*(4-3*cosSqAlpha));var L=lambda-(1-C)*f*sinAlpha*(sigma+C*sinSigma*(cos2SigmaM+C*cosSigma*(-1+2*cos2SigmaM*cos2SigmaM)));var revAz=Math.atan2(sinAlpha,-tmp);return new OpenLayers.LonLat(lon1+u.deg(L),u.deg(lat2));};OpenLayers.Util.getParameters=function(url){url=(url===null||url===undefined)?window.location.href:url;var paramsString="";if(OpenLayers.String.contains(url,'?')){var start=url.indexOf('?')+1;var end=OpenLayers.String.contains(url,"#")?url.indexOf('#'):url.length;paramsString=url.substring(start,end);} +var parameters={};var pairs=paramsString.split(/[&;]/);for(var i=0,len=pairs.length;i<len;++i){var keyValue=pairs[i].split('=');if(keyValue[0]){var key=keyValue[0];try{key=decodeURIComponent(key);}catch(err){key=unescape(key);} +var value=(keyValue[1]||'').replace(/\+/g," ");try{value=decodeURIComponent(value);}catch(err){value=unescape(value);} +value=value.split(",");if(value.length==1){value=value[0];} +parameters[key]=value;}} +return parameters;};OpenLayers.Util.getArgs=function(url){OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",{'newMethod':'OpenLayers.Util.getParameters'}));return OpenLayers.Util.getParameters(url);};OpenLayers.Util.lastSeqID=0;OpenLayers.Util.createUniqueID=function(prefix){if(prefix==null){prefix="id_";} +OpenLayers.Util.lastSeqID+=1;return prefix+OpenLayers.Util.lastSeqID;};OpenLayers.INCHES_PER_UNIT={'inches':1.0,'ft':12.0,'mi':63360.0,'m':39.3701,'km':39370.1,'dd':4374754,'yd':36};OpenLayers.INCHES_PER_UNIT["in"]=OpenLayers.INCHES_PER_UNIT.inches;OpenLayers.INCHES_PER_UNIT["degrees"]=OpenLayers.INCHES_PER_UNIT.dd;OpenLayers.INCHES_PER_UNIT["nmi"]=1852*OpenLayers.INCHES_PER_UNIT.m;OpenLayers.METERS_PER_INCH=0.02540005080010160020;OpenLayers.Util.extend(OpenLayers.INCHES_PER_UNIT,{"Inch":OpenLayers.INCHES_PER_UNIT.inches,"Meter":1.0/OpenLayers.METERS_PER_INCH,"Foot":0.30480060960121920243/OpenLayers.METERS_PER_INCH,"IFoot":0.30480000000000000000/OpenLayers.METERS_PER_INCH,"ClarkeFoot":0.3047972651151/OpenLayers.METERS_PER_INCH,"SearsFoot":0.30479947153867624624/OpenLayers.METERS_PER_INCH,"GoldCoastFoot":0.30479971018150881758/OpenLayers.METERS_PER_INCH,"IInch":0.02540000000000000000/OpenLayers.METERS_PER_INCH,"MicroInch":0.00002540000000000000/OpenLayers.METERS_PER_INCH,"Mil":0.00000002540000000000/OpenLayers.METERS_PER_INCH,"Centimeter":0.01000000000000000000/OpenLayers.METERS_PER_INCH,"Kilometer":1000.00000000000000000000/OpenLayers.METERS_PER_INCH,"Yard":0.91440182880365760731/OpenLayers.METERS_PER_INCH,"SearsYard":0.914398414616029/OpenLayers.METERS_PER_INCH,"IndianYard":0.91439853074444079983/OpenLayers.METERS_PER_INCH,"IndianYd37":0.91439523/OpenLayers.METERS_PER_INCH,"IndianYd62":0.9143988/OpenLayers.METERS_PER_INCH,"IndianYd75":0.9143985/OpenLayers.METERS_PER_INCH,"IndianFoot":0.30479951/OpenLayers.METERS_PER_INCH,"IndianFt37":0.30479841/OpenLayers.METERS_PER_INCH,"IndianFt62":0.3047996/OpenLayers.METERS_PER_INCH,"IndianFt75":0.3047995/OpenLayers.METERS_PER_INCH,"Mile":1609.34721869443738887477/OpenLayers.METERS_PER_INCH,"IYard":0.91440000000000000000/OpenLayers.METERS_PER_INCH,"IMile":1609.34400000000000000000/OpenLayers.METERS_PER_INCH,"NautM":1852.00000000000000000000/OpenLayers.METERS_PER_INCH,"Lat-66":110943.316488932731/OpenLayers.METERS_PER_INCH,"Lat-83":110946.25736872234125/OpenLayers.METERS_PER_INCH,"Decimeter":0.10000000000000000000/OpenLayers.METERS_PER_INCH,"Millimeter":0.00100000000000000000/OpenLayers.METERS_PER_INCH,"Dekameter":10.00000000000000000000/OpenLayers.METERS_PER_INCH,"Decameter":10.00000000000000000000/OpenLayers.METERS_PER_INCH,"Hectometer":100.00000000000000000000/OpenLayers.METERS_PER_INCH,"GermanMeter":1.0000135965/OpenLayers.METERS_PER_INCH,"CaGrid":0.999738/OpenLayers.METERS_PER_INCH,"ClarkeChain":20.1166194976/OpenLayers.METERS_PER_INCH,"GunterChain":20.11684023368047/OpenLayers.METERS_PER_INCH,"BenoitChain":20.116782494375872/OpenLayers.METERS_PER_INCH,"SearsChain":20.11676512155/OpenLayers.METERS_PER_INCH,"ClarkeLink":0.201166194976/OpenLayers.METERS_PER_INCH,"GunterLink":0.2011684023368047/OpenLayers.METERS_PER_INCH,"BenoitLink":0.20116782494375872/OpenLayers.METERS_PER_INCH,"SearsLink":0.2011676512155/OpenLayers.METERS_PER_INCH,"Rod":5.02921005842012/OpenLayers.METERS_PER_INCH,"IntnlChain":20.1168/OpenLayers.METERS_PER_INCH,"IntnlLink":0.201168/OpenLayers.METERS_PER_INCH,"Perch":5.02921005842012/OpenLayers.METERS_PER_INCH,"Pole":5.02921005842012/OpenLayers.METERS_PER_INCH,"Furlong":201.1684023368046/OpenLayers.METERS_PER_INCH,"Rood":3.778266898/OpenLayers.METERS_PER_INCH,"CapeFoot":0.3047972615/OpenLayers.METERS_PER_INCH,"Brealey":375.00000000000000000000/OpenLayers.METERS_PER_INCH,"ModAmFt":0.304812252984505969011938/OpenLayers.METERS_PER_INCH,"Fathom":1.8288/OpenLayers.METERS_PER_INCH,"NautM-UK":1853.184/OpenLayers.METERS_PER_INCH,"50kilometers":50000.0/OpenLayers.METERS_PER_INCH,"150kilometers":150000.0/OpenLayers.METERS_PER_INCH});OpenLayers.Util.extend(OpenLayers.INCHES_PER_UNIT,{"mm":OpenLayers.INCHES_PER_UNIT["Meter"]/1000.0,"cm":OpenLayers.INCHES_PER_UNIT["Meter"]/100.0,"dm":OpenLayers.INCHES_PER_UNIT["Meter"]*100.0,"km":OpenLayers.INCHES_PER_UNIT["Meter"]*1000.0,"kmi":OpenLayers.INCHES_PER_UNIT["nmi"],"fath":OpenLayers.INCHES_PER_UNIT["Fathom"],"ch":OpenLayers.INCHES_PER_UNIT["IntnlChain"],"link":OpenLayers.INCHES_PER_UNIT["IntnlLink"],"us-in":OpenLayers.INCHES_PER_UNIT["inches"],"us-ft":OpenLayers.INCHES_PER_UNIT["Foot"],"us-yd":OpenLayers.INCHES_PER_UNIT["Yard"],"us-ch":OpenLayers.INCHES_PER_UNIT["GunterChain"],"us-mi":OpenLayers.INCHES_PER_UNIT["Mile"],"ind-yd":OpenLayers.INCHES_PER_UNIT["IndianYd37"],"ind-ft":OpenLayers.INCHES_PER_UNIT["IndianFt37"],"ind-ch":20.11669506/OpenLayers.METERS_PER_INCH});OpenLayers.DOTS_PER_INCH=72;OpenLayers.Util.normalizeScale=function(scale){var normScale=(scale>1.0)?(1.0/scale):scale;return normScale;};OpenLayers.Util.getResolutionFromScale=function(scale,units){var resolution;if(scale){if(units==null){units="degrees";} +var normScale=OpenLayers.Util.normalizeScale(scale);resolution=1/(normScale*OpenLayers.INCHES_PER_UNIT[units]*OpenLayers.DOTS_PER_INCH);} +return resolution;};OpenLayers.Util.getScaleFromResolution=function(resolution,units){if(units==null){units="degrees";} +var scale=resolution*OpenLayers.INCHES_PER_UNIT[units]*OpenLayers.DOTS_PER_INCH;return scale;};OpenLayers.Util.safeStopPropagation=function(evt){OpenLayers.Event.stop(evt,true);};OpenLayers.Util.pagePosition=function(forElement){var pos=[0,0];var viewportElement=OpenLayers.Util.getViewportElement();if(!forElement||forElement==window||forElement==viewportElement){return pos;} +var BUGGY_GECKO_BOX_OBJECT=OpenLayers.IS_GECKO&&document.getBoxObjectFor&&OpenLayers.Element.getStyle(forElement,'position')=='absolute'&&(forElement.style.top==''||forElement.style.left=='');var parent=null;var box;if(forElement.getBoundingClientRect){box=forElement.getBoundingClientRect();var scrollTop=viewportElement.scrollTop;var scrollLeft=viewportElement.scrollLeft;pos[0]=box.left+scrollLeft;pos[1]=box.top+scrollTop;}else if(document.getBoxObjectFor&&!BUGGY_GECKO_BOX_OBJECT){box=document.getBoxObjectFor(forElement);var vpBox=document.getBoxObjectFor(viewportElement);pos[0]=box.screenX-vpBox.screenX;pos[1]=box.screenY-vpBox.screenY;}else{pos[0]=forElement.offsetLeft;pos[1]=forElement.offsetTop;parent=forElement.offsetParent;if(parent!=forElement){while(parent){pos[0]+=parent.offsetLeft;pos[1]+=parent.offsetTop;parent=parent.offsetParent;}} +var browser=OpenLayers.BROWSER_NAME;if(browser=="opera"||(browser=="safari"&&OpenLayers.Element.getStyle(forElement,'position')=='absolute')){pos[1]-=document.body.offsetTop;} +parent=forElement.offsetParent;while(parent&&parent!=document.body){pos[0]-=parent.scrollLeft;if(browser!="opera"||parent.tagName!='TR'){pos[1]-=parent.scrollTop;} +parent=parent.offsetParent;}} +return pos;};OpenLayers.Util.getViewportElement=function(){var viewportElement=arguments.callee.viewportElement;if(viewportElement==undefined){viewportElement=(OpenLayers.BROWSER_NAME=="msie"&&document.compatMode!='CSS1Compat')?document.body:document.documentElement;arguments.callee.viewportElement=viewportElement;} +return viewportElement;};OpenLayers.Util.isEquivalentUrl=function(url1,url2,options){options=options||{};OpenLayers.Util.applyDefaults(options,{ignoreCase:true,ignorePort80:true,ignoreHash:true});var urlObj1=OpenLayers.Util.createUrlObject(url1,options);var urlObj2=OpenLayers.Util.createUrlObject(url2,options);for(var key in urlObj1){if(key!=="args"){if(urlObj1[key]!=urlObj2[key]){return false;}}} +for(var key in urlObj1.args){if(urlObj1.args[key]!=urlObj2.args[key]){return false;} +delete urlObj2.args[key];} +for(var key in urlObj2.args){return false;} +return true;};OpenLayers.Util.createUrlObject=function(url,options){options=options||{};if(!(/^\w+:\/\//).test(url)){var loc=window.location;var port=loc.port?":"+loc.port:"";var fullUrl=loc.protocol+"//"+loc.host.split(":").shift()+port;if(url.indexOf("/")===0){url=fullUrl+url;}else{var parts=loc.pathname.split("/");parts.pop();url=fullUrl+parts.join("/")+"/"+url;}} +if(options.ignoreCase){url=url.toLowerCase();} +var a=document.createElement('a');a.href=url;var urlObject={};urlObject.host=a.host.split(":").shift();urlObject.protocol=a.protocol;if(options.ignorePort80){urlObject.port=(a.port=="80"||a.port=="0")?"":a.port;}else{urlObject.port=(a.port==""||a.port=="0")?"80":a.port;} +urlObject.hash=(options.ignoreHash||a.hash==="#")?"":a.hash;var queryString=a.search;if(!queryString){var qMark=url.indexOf("?");queryString=(qMark!=-1)?url.substr(qMark):"";} +urlObject.args=OpenLayers.Util.getParameters(queryString);urlObject.pathname=(a.pathname.charAt(0)=="/")?a.pathname:"/"+a.pathname;return urlObject;};OpenLayers.Util.removeTail=function(url){var head=null;var qMark=url.indexOf("?");var hashMark=url.indexOf("#");if(qMark==-1){head=(hashMark!=-1)?url.substr(0,hashMark):url;}else{head=(hashMark!=-1)?url.substr(0,Math.min(qMark,hashMark)):url.substr(0,qMark);} +return head;};OpenLayers.IS_GECKO=(function(){var ua=navigator.userAgent.toLowerCase();return ua.indexOf("webkit")==-1&&ua.indexOf("gecko")!=-1;})();OpenLayers.BROWSER_NAME=(function(){var name="";var ua=navigator.userAgent.toLowerCase();if(ua.indexOf("opera")!=-1){name="opera";}else if(ua.indexOf("msie")!=-1){name="msie";}else if(ua.indexOf("safari")!=-1){name="safari";}else if(ua.indexOf("mozilla")!=-1){if(ua.indexOf("firefox")!=-1){name="firefox";}else{name="mozilla";}} +return name;})();OpenLayers.Util.getBrowserName=function(){return OpenLayers.BROWSER_NAME;};OpenLayers.Util.getRenderedDimensions=function(contentHTML,size,options){var w,h;var container=document.createElement("div");container.style.visibility="hidden";var containerElement=(options&&options.containerElement)?options.containerElement:document.body;if(size){if(size.w){w=size.w;container.style.width=w+"px";}else if(size.h){h=size.h;container.style.height=h+"px";}} +if(options&&options.displayClass){container.className=options.displayClass;} +var content=document.createElement("div");content.innerHTML=contentHTML;content.style.overflow="visible";if(content.childNodes){for(var i=0,l=content.childNodes.length;i<l;i++){if(!content.childNodes[i].style)continue;content.childNodes[i].style.overflow="visible";}} +container.appendChild(content);containerElement.appendChild(container);var parentHasPositionAbsolute=false;var parent=container.parentNode;while(parent&&parent.tagName.toLowerCase()!="body"){var parentPosition=OpenLayers.Element.getStyle(parent,"position");if(parentPosition=="absolute"){parentHasPositionAbsolute=true;break;}else if(parentPosition&&parentPosition!="static"){break;} +parent=parent.parentNode;} +if(!parentHasPositionAbsolute){container.style.position="absolute";} +if(!w){w=parseInt(content.scrollWidth);container.style.width=w+"px";} +if(!h){h=parseInt(content.scrollHeight);} +container.removeChild(content);containerElement.removeChild(container);return new OpenLayers.Size(w,h);};OpenLayers.Util.getScrollbarWidth=function(){var scrollbarWidth=OpenLayers.Util._scrollbarWidth;if(scrollbarWidth==null){var scr=null;var inn=null;var wNoScroll=0;var wScroll=0;scr=document.createElement('div');scr.style.position='absolute';scr.style.top='-1000px';scr.style.left='-1000px';scr.style.width='100px';scr.style.height='50px';scr.style.overflow='hidden';inn=document.createElement('div');inn.style.width='100%';inn.style.height='200px';scr.appendChild(inn);document.body.appendChild(scr);wNoScroll=inn.offsetWidth;scr.style.overflow='scroll';wScroll=inn.offsetWidth;document.body.removeChild(document.body.lastChild);OpenLayers.Util._scrollbarWidth=(wNoScroll-wScroll);scrollbarWidth=OpenLayers.Util._scrollbarWidth;} +return scrollbarWidth;};OpenLayers.Util.getFormattedLonLat=function(coordinate,axis,dmsOption){if(!dmsOption){dmsOption='dms';} +coordinate=(coordinate+540)%360-180;var abscoordinate=Math.abs(coordinate);var coordinatedegrees=Math.floor(abscoordinate);var coordinateminutes=(abscoordinate-coordinatedegrees)/(1/60);var tempcoordinateminutes=coordinateminutes;coordinateminutes=Math.floor(coordinateminutes);var coordinateseconds=(tempcoordinateminutes-coordinateminutes)/(1/60);coordinateseconds=Math.round(coordinateseconds*10);coordinateseconds/=10;if(coordinateseconds>=60){coordinateseconds-=60;coordinateminutes+=1;if(coordinateminutes>=60){coordinateminutes-=60;coordinatedegrees+=1;}} +if(coordinatedegrees<10){coordinatedegrees="0"+coordinatedegrees;} +var str=coordinatedegrees+"\u00B0";if(dmsOption.indexOf('dm')>=0){if(coordinateminutes<10){coordinateminutes="0"+coordinateminutes;} +str+=coordinateminutes+"'";if(dmsOption.indexOf('dms')>=0){if(coordinateseconds<10){coordinateseconds="0"+coordinateseconds;} +str+=coordinateseconds+'"';}} +if(axis=="lon"){str+=coordinate<0?OpenLayers.i18n("W"):OpenLayers.i18n("E");}else{str+=coordinate<0?OpenLayers.i18n("S"):OpenLayers.i18n("N");} +return str;};OpenLayers.Format=OpenLayers.Class({options:null,externalProjection:null,internalProjection:null,data:null,keepData:false,initialize:function(options){OpenLayers.Util.extend(this,options);this.options=options;},destroy:function(){},read:function(data){OpenLayers.Console.userError(OpenLayers.i18n("readNotImplemented"));},write:function(object){OpenLayers.Console.userError(OpenLayers.i18n("writeNotImplemented"));},CLASS_NAME:"OpenLayers.Format"});OpenLayers.Feature=OpenLayers.Class({layer:null,id:null,lonlat:null,data:null,marker:null,popupClass:null,popup:null,initialize:function(layer,lonlat,data){this.layer=layer;this.lonlat=lonlat;this.data=(data!=null)?data:{};this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_");},destroy:function(){if((this.layer!=null)&&(this.layer.map!=null)){if(this.popup!=null){this.layer.map.removePopup(this.popup);}} +if(this.layer!=null&&this.marker!=null){this.layer.removeMarker(this.marker);} +this.layer=null;this.id=null;this.lonlat=null;this.data=null;if(this.marker!=null){this.destroyMarker(this.marker);this.marker=null;} +if(this.popup!=null){this.destroyPopup(this.popup);this.popup=null;}},onScreen:function(){var onScreen=false;if((this.layer!=null)&&(this.layer.map!=null)){var screenBounds=this.layer.map.getExtent();onScreen=screenBounds.containsLonLat(this.lonlat);} +return onScreen;},createMarker:function(){if(this.lonlat!=null){this.marker=new OpenLayers.Marker(this.lonlat,this.data.icon);} +return this.marker;},destroyMarker:function(){this.marker.destroy();},createPopup:function(closeBox){if(this.lonlat!=null){if(!this.popup){var anchor=(this.marker)?this.marker.icon:null;var popupClass=this.popupClass?this.popupClass:OpenLayers.Popup.AnchoredBubble;this.popup=new popupClass(this.id+"_popup",this.lonlat,this.data.popupSize,this.data.popupContentHTML,anchor,closeBox);} +if(this.data.overflow!=null){this.popup.contentDiv.style.overflow=this.data.overflow;} +this.popup.feature=this;} +return this.popup;},destroyPopup:function(){if(this.popup){this.popup.feature=null;this.popup.destroy();this.popup=null;}},CLASS_NAME:"OpenLayers.Feature"});OpenLayers.State={UNKNOWN:'Unknown',INSERT:'Insert',UPDATE:'Update',DELETE:'Delete'};OpenLayers.Feature.Vector=OpenLayers.Class(OpenLayers.Feature,{fid:null,geometry:null,attributes:null,bounds:null,state:null,style:null,url:null,renderIntent:"default",modified:null,initialize:function(geometry,attributes,style){OpenLayers.Feature.prototype.initialize.apply(this,[null,null,attributes]);this.lonlat=null;this.geometry=geometry?geometry:null;this.state=null;this.attributes={};if(attributes){this.attributes=OpenLayers.Util.extend(this.attributes,attributes);} +this.style=style?style:null;},destroy:function(){if(this.layer){this.layer.removeFeatures(this);this.layer=null;} +this.geometry=null;this.modified=null;OpenLayers.Feature.prototype.destroy.apply(this,arguments);},clone:function(){return new OpenLayers.Feature.Vector(this.geometry?this.geometry.clone():null,this.attributes,this.style);},onScreen:function(boundsOnly){var onScreen=false;if(this.layer&&this.layer.map){var screenBounds=this.layer.map.getExtent();if(boundsOnly){var featureBounds=this.geometry.getBounds();onScreen=screenBounds.intersectsBounds(featureBounds);}else{var screenPoly=screenBounds.toGeometry();onScreen=screenPoly.intersects(this.geometry);}} +return onScreen;},getVisibility:function(){return!(this.style&&this.style.display=='none'||!this.layer||this.layer&&this.layer.styleMap&&this.layer.styleMap.createSymbolizer(this,this.renderIntent).display=='none'||this.layer&&!this.layer.getVisibility());},createMarker:function(){return null;},destroyMarker:function(){},createPopup:function(){return null;},atPoint:function(lonlat,toleranceLon,toleranceLat){var atPoint=false;if(this.geometry){atPoint=this.geometry.atPoint(lonlat,toleranceLon,toleranceLat);} +return atPoint;},destroyPopup:function(){},move:function(location){if(!this.layer||!this.geometry.move){return undefined;} +var pixel;if(location.CLASS_NAME=="OpenLayers.LonLat"){pixel=this.layer.getViewPortPxFromLonLat(location);}else{pixel=location;} +var lastPixel=this.layer.getViewPortPxFromLonLat(this.geometry.getBounds().getCenterLonLat());var res=this.layer.map.getResolution();this.geometry.move(res*(pixel.x-lastPixel.x),res*(lastPixel.y-pixel.y));this.layer.drawFeature(this);return lastPixel;},toState:function(state){if(state==OpenLayers.State.UPDATE){switch(this.state){case OpenLayers.State.UNKNOWN:case OpenLayers.State.DELETE:this.state=state;break;case OpenLayers.State.UPDATE:case OpenLayers.State.INSERT:break;}}else if(state==OpenLayers.State.INSERT){switch(this.state){case OpenLayers.State.UNKNOWN:break;default:this.state=state;break;}}else if(state==OpenLayers.State.DELETE){switch(this.state){case OpenLayers.State.INSERT:break;case OpenLayers.State.DELETE:break;case OpenLayers.State.UNKNOWN:case OpenLayers.State.UPDATE:this.state=state;break;}}else if(state==OpenLayers.State.UNKNOWN){this.state=state;}},CLASS_NAME:"OpenLayers.Feature.Vector"});OpenLayers.Feature.Vector.style={'default':{fillColor:"#ee9900",fillOpacity:0.4,hoverFillColor:"white",hoverFillOpacity:0.8,strokeColor:"#ee9900",strokeOpacity:1,strokeWidth:1,strokeLinecap:"round",strokeDashstyle:"solid",hoverStrokeColor:"red",hoverStrokeOpacity:1,hoverStrokeWidth:0.2,pointRadius:6,hoverPointRadius:1,hoverPointUnit:"%",pointerEvents:"visiblePainted",cursor:"inherit"},'select':{fillColor:"blue",fillOpacity:0.4,hoverFillColor:"white",hoverFillOpacity:0.8,strokeColor:"blue",strokeOpacity:1,strokeWidth:2,strokeLinecap:"round",strokeDashstyle:"solid",hoverStrokeColor:"red",hoverStrokeOpacity:1,hoverStrokeWidth:0.2,pointRadius:6,hoverPointRadius:1,hoverPointUnit:"%",pointerEvents:"visiblePainted",cursor:"pointer"},'temporary':{fillColor:"#66cccc",fillOpacity:0.2,hoverFillColor:"white",hoverFillOpacity:0.8,strokeColor:"#66cccc",strokeOpacity:1,strokeLinecap:"round",strokeWidth:2,strokeDashstyle:"solid",hoverStrokeColor:"red",hoverStrokeOpacity:1,hoverStrokeWidth:0.2,pointRadius:6,hoverPointRadius:1,hoverPointUnit:"%",pointerEvents:"visiblePainted",cursor:"inherit"},'delete':{display:"none"}};OpenLayers.Format.WKT=OpenLayers.Class(OpenLayers.Format,{initialize:function(options){this.regExes={'typeStr':/^\s*(\w+)\s*\(\s*(.*)\s*\)\s*$/,'spaces':/\s+/,'parenComma':/\)\s*,\s*\(/,'doubleParenComma':/\)\s*\)\s*,\s*\(\s*\(/,'trimParens':/^\s*\(?(.*?)\)?\s*$/};OpenLayers.Format.prototype.initialize.apply(this,[options]);},read:function(wkt){var features,type,str;wkt=wkt.replace(/[\n\r]/g," ");var matches=this.regExes.typeStr.exec(wkt);if(matches){type=matches[1].toLowerCase();str=matches[2];if(this.parse[type]){features=this.parse[type].apply(this,[str]);} +if(this.internalProjection&&this.externalProjection){if(features&&features.CLASS_NAME=="OpenLayers.Feature.Vector"){features.geometry.transform(this.externalProjection,this.internalProjection);}else if(features&&type!="geometrycollection"&&typeof features=="object"){for(var i=0,len=features.length;i<len;i++){var component=features[i];component.geometry.transform(this.externalProjection,this.internalProjection);}}}} +return features;},write:function(features){var collection,geometry,type,data,isCollection;if(features.constructor==Array){collection=features;isCollection=true;}else{collection=[features];isCollection=false;} +var pieces=[];if(isCollection){pieces.push('GEOMETRYCOLLECTION(');} +for(var i=0,len=collection.length;i<len;++i){if(isCollection&&i>0){pieces.push(',');} +geometry=collection[i].geometry;pieces.push(this.extractGeometry(geometry));} +if(isCollection){pieces.push(')');} +return pieces.join('');},extractGeometry:function(geometry){var type=geometry.CLASS_NAME.split('.')[2].toLowerCase();if(!this.extract[type]){return null;} +if(this.internalProjection&&this.externalProjection){geometry=geometry.clone();geometry.transform(this.internalProjection,this.externalProjection);} +var wktType=type=='collection'?'GEOMETRYCOLLECTION':type.toUpperCase();var data=wktType+'('+this.extract[type].apply(this,[geometry])+')';return data;},extract:{'point':function(point){return point.x+' '+point.y;},'multipoint':function(multipoint){var array=[];for(var i=0,len=multipoint.components.length;i<len;++i){array.push('('+ +this.extract.point.apply(this,[multipoint.components[i]])+')');} +return array.join(',');},'linestring':function(linestring){var array=[];for(var i=0,len=linestring.components.length;i<len;++i){array.push(this.extract.point.apply(this,[linestring.components[i]]));} +return array.join(',');},'multilinestring':function(multilinestring){var array=[];for(var i=0,len=multilinestring.components.length;i<len;++i){array.push('('+ +this.extract.linestring.apply(this,[multilinestring.components[i]])+')');} +return array.join(',');},'polygon':function(polygon){var array=[];for(var i=0,len=polygon.components.length;i<len;++i){array.push('('+ +this.extract.linestring.apply(this,[polygon.components[i]])+')');} +return array.join(',');},'multipolygon':function(multipolygon){var array=[];for(var i=0,len=multipolygon.components.length;i<len;++i){array.push('('+ +this.extract.polygon.apply(this,[multipolygon.components[i]])+')');} +return array.join(',');},'collection':function(collection){var array=[];for(var i=0,len=collection.components.length;i<len;++i){array.push(this.extractGeometry.apply(this,[collection.components[i]]));} +return array.join(',');}},parse:{'point':function(str){var coords=OpenLayers.String.trim(str).split(this.regExes.spaces);return new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point(coords[0],coords[1]));},'multipoint':function(str){var point;var points=OpenLayers.String.trim(str).split(',');var components=[];for(var i=0,len=points.length;i<len;++i){point=points[i].replace(this.regExes.trimParens,'$1');components.push(this.parse.point.apply(this,[point]).geometry);} +return new OpenLayers.Feature.Vector(new OpenLayers.Geometry.MultiPoint(components));},'linestring':function(str){var points=OpenLayers.String.trim(str).split(',');var components=[];for(var i=0,len=points.length;i<len;++i){components.push(this.parse.point.apply(this,[points[i]]).geometry);} +return new OpenLayers.Feature.Vector(new OpenLayers.Geometry.LineString(components));},'multilinestring':function(str){var line;var lines=OpenLayers.String.trim(str).split(this.regExes.parenComma);var components=[];for(var i=0,len=lines.length;i<len;++i){line=lines[i].replace(this.regExes.trimParens,'$1');components.push(this.parse.linestring.apply(this,[line]).geometry);} +return new OpenLayers.Feature.Vector(new OpenLayers.Geometry.MultiLineString(components));},'polygon':function(str){var ring,linestring,linearring;var rings=OpenLayers.String.trim(str).split(this.regExes.parenComma);var components=[];for(var i=0,len=rings.length;i<len;++i){ring=rings[i].replace(this.regExes.trimParens,'$1');linestring=this.parse.linestring.apply(this,[ring]).geometry;linearring=new OpenLayers.Geometry.LinearRing(linestring.components);components.push(linearring);} +return new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Polygon(components));},'multipolygon':function(str){var polygon;var polygons=OpenLayers.String.trim(str).split(this.regExes.doubleParenComma);var components=[];for(var i=0,len=polygons.length;i<len;++i){polygon=polygons[i].replace(this.regExes.trimParens,'$1');components.push(this.parse.polygon.apply(this,[polygon]).geometry);} +return new OpenLayers.Feature.Vector(new OpenLayers.Geometry.MultiPolygon(components));},'geometrycollection':function(str){str=str.replace(/,\s*([A-Za-z])/g,'|$1');var wktArray=OpenLayers.String.trim(str).split('|');var components=[];for(var i=0,len=wktArray.length;i<len;++i){components.push(OpenLayers.Format.WKT.prototype.read.apply(this,[wktArray[i]]));} +return components;}},CLASS_NAME:"OpenLayers.Format.WKT"});OpenLayers.Geometry=OpenLayers.Class({id:null,parent:null,bounds:null,initialize:function(){this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_");},destroy:function(){this.id=null;this.bounds=null;},clone:function(){return new OpenLayers.Geometry();},setBounds:function(bounds){if(bounds){this.bounds=bounds.clone();}},clearBounds:function(){this.bounds=null;if(this.parent){this.parent.clearBounds();}},extendBounds:function(newBounds){var bounds=this.getBounds();if(!bounds){this.setBounds(newBounds);}else{this.bounds.extend(newBounds);}},getBounds:function(){if(this.bounds==null){this.calculateBounds();} +return this.bounds;},calculateBounds:function(){},distanceTo:function(geometry,options){},getVertices:function(nodes){},atPoint:function(lonlat,toleranceLon,toleranceLat){var atPoint=false;var bounds=this.getBounds();if((bounds!=null)&&(lonlat!=null)){var dX=(toleranceLon!=null)?toleranceLon:0;var dY=(toleranceLat!=null)?toleranceLat:0;var toleranceBounds=new OpenLayers.Bounds(this.bounds.left-dX,this.bounds.bottom-dY,this.bounds.right+dX,this.bounds.top+dY);atPoint=toleranceBounds.containsLonLat(lonlat);} +return atPoint;},getLength:function(){return 0.0;},getArea:function(){return 0.0;},getCentroid:function(){return null;},toString:function(){return OpenLayers.Format.WKT.prototype.write(new OpenLayers.Feature.Vector(this));},CLASS_NAME:"OpenLayers.Geometry"});OpenLayers.Geometry.fromWKT=function(wkt){var format=arguments.callee.format;if(!format){format=new OpenLayers.Format.WKT();arguments.callee.format=format;} +var geom;var result=format.read(wkt);if(result instanceof OpenLayers.Feature.Vector){geom=result.geometry;}else if(OpenLayers.Util.isArray(result)){var len=result.length;var components=new Array(len);for(var i=0;i<len;++i){components[i]=result[i].geometry;} +geom=new OpenLayers.Geometry.Collection(components);} +return geom;};OpenLayers.Geometry.segmentsIntersect=function(seg1,seg2,options){var point=options&&options.point;var tolerance=options&&options.tolerance;var intersection=false;var x11_21=seg1.x1-seg2.x1;var y11_21=seg1.y1-seg2.y1;var x12_11=seg1.x2-seg1.x1;var y12_11=seg1.y2-seg1.y1;var y22_21=seg2.y2-seg2.y1;var x22_21=seg2.x2-seg2.x1;var d=(y22_21*x12_11)-(x22_21*y12_11);var n1=(x22_21*y11_21)-(y22_21*x11_21);var n2=(x12_11*y11_21)-(y12_11*x11_21);if(d==0){if(n1==0&&n2==0){intersection=true;}}else{var along1=n1/d;var along2=n2/d;if(along1>=0&&along1<=1&&along2>=0&&along2<=1){if(!point){intersection=true;}else{var x=seg1.x1+(along1*x12_11);var y=seg1.y1+(along1*y12_11);intersection=new OpenLayers.Geometry.Point(x,y);}}} +if(tolerance){var dist;if(intersection){if(point){var segs=[seg1,seg2];var seg,x,y;outer:for(var i=0;i<2;++i){seg=segs[i];for(var j=1;j<3;++j){x=seg["x"+j];y=seg["y"+j];dist=Math.sqrt(Math.pow(x-intersection.x,2)+ +Math.pow(y-intersection.y,2));if(dist<tolerance){intersection.x=x;intersection.y=y;break outer;}}}}}else{var segs=[seg1,seg2];var source,target,x,y,p,result;outer:for(var i=0;i<2;++i){source=segs[i];target=segs[(i+1)%2];for(var j=1;j<3;++j){p={x:source["x"+j],y:source["y"+j]};result=OpenLayers.Geometry.distanceToSegment(p,target);if(result.distance<tolerance){if(point){intersection=new OpenLayers.Geometry.Point(p.x,p.y);}else{intersection=true;} +break outer;}}}}} +return intersection;};OpenLayers.Geometry.distanceToSegment=function(point,segment){var x0=point.x;var y0=point.y;var x1=segment.x1;var y1=segment.y1;var x2=segment.x2;var y2=segment.y2;var dx=x2-x1;var dy=y2-y1;var along=((dx*(x0-x1))+(dy*(y0-y1)))/(Math.pow(dx,2)+Math.pow(dy,2));var x,y;if(along<=0.0){x=x1;y=y1;}else if(along>=1.0){x=x2;y=y2;}else{x=x1+along*dx;y=y1+along*dy;} +return{distance:Math.sqrt(Math.pow(x-x0,2)+Math.pow(y-y0,2)),x:x,y:y};};OpenLayers.Geometry.Collection=OpenLayers.Class(OpenLayers.Geometry,{components:null,componentTypes:null,initialize:function(components){OpenLayers.Geometry.prototype.initialize.apply(this,arguments);this.components=[];if(components!=null){this.addComponents(components);}},destroy:function(){this.components.length=0;this.components=null;OpenLayers.Geometry.prototype.destroy.apply(this,arguments);},clone:function(){var geometry=eval("new "+this.CLASS_NAME+"()");for(var i=0,len=this.components.length;i<len;i++){geometry.addComponent(this.components[i].clone());} +OpenLayers.Util.applyDefaults(geometry,this);return geometry;},getComponentsString:function(){var strings=[];for(var i=0,len=this.components.length;i<len;i++){strings.push(this.components[i].toShortString());} +return strings.join(",");},calculateBounds:function(){this.bounds=null;var bounds=new OpenLayers.Bounds();var components=this.components;if(components){for(var i=0,len=components.length;i<len;i++){bounds.extend(components[i].getBounds());}} +if(bounds.left!=null&&bounds.bottom!=null&&bounds.right!=null&&bounds.top!=null){this.setBounds(bounds);}},addComponents:function(components){if(!(OpenLayers.Util.isArray(components))){components=[components];} +for(var i=0,len=components.length;i<len;i++){this.addComponent(components[i]);}},addComponent:function(component,index){var added=false;if(component){if(this.componentTypes==null||(OpenLayers.Util.indexOf(this.componentTypes,component.CLASS_NAME)>-1)){if(index!=null&&(index<this.components.length)){var components1=this.components.slice(0,index);var components2=this.components.slice(index,this.components.length);components1.push(component);this.components=components1.concat(components2);}else{this.components.push(component);} +component.parent=this;this.clearBounds();added=true;}} +return added;},removeComponents:function(components){var removed=false;if(!(OpenLayers.Util.isArray(components))){components=[components];} +for(var i=components.length-1;i>=0;--i){removed=this.removeComponent(components[i])||removed;} +return removed;},removeComponent:function(component){OpenLayers.Util.removeItem(this.components,component);this.clearBounds();return true;},getLength:function(){var length=0.0;for(var i=0,len=this.components.length;i<len;i++){length+=this.components[i].getLength();} +return length;},getArea:function(){var area=0.0;for(var i=0,len=this.components.length;i<len;i++){area+=this.components[i].getArea();} +return area;},getGeodesicArea:function(projection){var area=0.0;for(var i=0,len=this.components.length;i<len;i++){area+=this.components[i].getGeodesicArea(projection);} +return area;},getCentroid:function(weighted){if(!weighted){return this.components.length&&this.components[0].getCentroid();} +var len=this.components.length;if(!len){return false;} +var areas=[];var centroids=[];var areaSum=0;var minArea=Number.MAX_VALUE;var component;for(var i=0;i<len;++i){component=this.components[i];var area=component.getArea();var centroid=component.getCentroid(true);if(isNaN(area)||isNaN(centroid.x)||isNaN(centroid.y)){continue;} +areas.push(area);areaSum+=area;minArea=(area<minArea&&area>0)?area:minArea;centroids.push(centroid);} +len=areas.length;if(areaSum===0){for(var i=0;i<len;++i){areas[i]=1;} +areaSum=areas.length;}else{for(var i=0;i<len;++i){areas[i]/=minArea;} +areaSum/=minArea;} +var xSum=0,ySum=0,centroid,area;for(var i=0;i<len;++i){centroid=centroids[i];area=areas[i];xSum+=centroid.x*area;ySum+=centroid.y*area;} +return new OpenLayers.Geometry.Point(xSum/areaSum,ySum/areaSum);},getGeodesicLength:function(projection){var length=0.0;for(var i=0,len=this.components.length;i<len;i++){length+=this.components[i].getGeodesicLength(projection);} +return length;},move:function(x,y){for(var i=0,len=this.components.length;i<len;i++){this.components[i].move(x,y);}},rotate:function(angle,origin){for(var i=0,len=this.components.length;i<len;++i){this.components[i].rotate(angle,origin);}},resize:function(scale,origin,ratio){for(var i=0;i<this.components.length;++i){this.components[i].resize(scale,origin,ratio);} +return this;},distanceTo:function(geometry,options){var edge=!(options&&options.edge===false);var details=edge&&options&&options.details;var result,best,distance;var min=Number.POSITIVE_INFINITY;for(var i=0,len=this.components.length;i<len;++i){result=this.components[i].distanceTo(geometry,options);distance=details?result.distance:result;if(distance<min){min=distance;best=result;if(min==0){break;}}} +return best;},equals:function(geometry){var equivalent=true;if(!geometry||!geometry.CLASS_NAME||(this.CLASS_NAME!=geometry.CLASS_NAME)){equivalent=false;}else if(!(OpenLayers.Util.isArray(geometry.components))||(geometry.components.length!=this.components.length)){equivalent=false;}else{for(var i=0,len=this.components.length;i<len;++i){if(!this.components[i].equals(geometry.components[i])){equivalent=false;break;}}} +return equivalent;},transform:function(source,dest){if(source&&dest){for(var i=0,len=this.components.length;i<len;i++){var component=this.components[i];component.transform(source,dest);} +this.bounds=null;} +return this;},intersects:function(geometry){var intersect=false;for(var i=0,len=this.components.length;i<len;++i){intersect=geometry.intersects(this.components[i]);if(intersect){break;}} +return intersect;},getVertices:function(nodes){var vertices=[];for(var i=0,len=this.components.length;i<len;++i){Array.prototype.push.apply(vertices,this.components[i].getVertices(nodes));} +return vertices;},CLASS_NAME:"OpenLayers.Geometry.Collection"});OpenLayers.Geometry.Point=OpenLayers.Class(OpenLayers.Geometry,{x:null,y:null,initialize:function(x,y){OpenLayers.Geometry.prototype.initialize.apply(this,arguments);this.x=parseFloat(x);this.y=parseFloat(y);},clone:function(obj){if(obj==null){obj=new OpenLayers.Geometry.Point(this.x,this.y);} +OpenLayers.Util.applyDefaults(obj,this);return obj;},calculateBounds:function(){this.bounds=new OpenLayers.Bounds(this.x,this.y,this.x,this.y);},distanceTo:function(geometry,options){var edge=!(options&&options.edge===false);var details=edge&&options&&options.details;var distance,x0,y0,x1,y1,result;if(geometry instanceof OpenLayers.Geometry.Point){x0=this.x;y0=this.y;x1=geometry.x;y1=geometry.y;distance=Math.sqrt(Math.pow(x0-x1,2)+Math.pow(y0-y1,2));result=!details?distance:{x0:x0,y0:y0,x1:x1,y1:y1,distance:distance};}else{result=geometry.distanceTo(this,options);if(details){result={x0:result.x1,y0:result.y1,x1:result.x0,y1:result.y0,distance:result.distance};}} +return result;},equals:function(geom){var equals=false;if(geom!=null){equals=((this.x==geom.x&&this.y==geom.y)||(isNaN(this.x)&&isNaN(this.y)&&isNaN(geom.x)&&isNaN(geom.y)));} +return equals;},toShortString:function(){return(this.x+", "+this.y);},move:function(x,y){this.x=this.x+x;this.y=this.y+y;this.clearBounds();},rotate:function(angle,origin){angle*=Math.PI/180;var radius=this.distanceTo(origin);var theta=angle+Math.atan2(this.y-origin.y,this.x-origin.x);this.x=origin.x+(radius*Math.cos(theta));this.y=origin.y+(radius*Math.sin(theta));this.clearBounds();},getCentroid:function(){return new OpenLayers.Geometry.Point(this.x,this.y);},resize:function(scale,origin,ratio){ratio=(ratio==undefined)?1:ratio;this.x=origin.x+(scale*ratio*(this.x-origin.x));this.y=origin.y+(scale*(this.y-origin.y));this.clearBounds();return this;},intersects:function(geometry){var intersect=false;if(geometry.CLASS_NAME=="OpenLayers.Geometry.Point"){intersect=this.equals(geometry);}else{intersect=geometry.intersects(this);} +return intersect;},transform:function(source,dest){if((source&&dest)){OpenLayers.Projection.transform(this,source,dest);this.bounds=null;} +return this;},getVertices:function(nodes){return[this];},CLASS_NAME:"OpenLayers.Geometry.Point"});OpenLayers.Geometry.MultiPoint=OpenLayers.Class(OpenLayers.Geometry.Collection,{componentTypes:["OpenLayers.Geometry.Point"],initialize:function(components){OpenLayers.Geometry.Collection.prototype.initialize.apply(this,arguments);},addPoint:function(point,index){this.addComponent(point,index);},removePoint:function(point){this.removeComponent(point);},CLASS_NAME:"OpenLayers.Geometry.MultiPoint"});OpenLayers.Geometry.Curve=OpenLayers.Class(OpenLayers.Geometry.MultiPoint,{componentTypes:["OpenLayers.Geometry.Point"],initialize:function(points){OpenLayers.Geometry.MultiPoint.prototype.initialize.apply(this,arguments);},getLength:function(){var length=0.0;if(this.components&&(this.components.length>1)){for(var i=1,len=this.components.length;i<len;i++){length+=this.components[i-1].distanceTo(this.components[i]);}} +return length;},getGeodesicLength:function(projection){var geom=this;if(projection){var gg=new OpenLayers.Projection("EPSG:4326");if(!gg.equals(projection)){geom=this.clone().transform(projection,gg);}} +var length=0.0;if(geom.components&&(geom.components.length>1)){var p1,p2;for(var i=1,len=geom.components.length;i<len;i++){p1=geom.components[i-1];p2=geom.components[i];length+=OpenLayers.Util.distVincenty({lon:p1.x,lat:p1.y},{lon:p2.x,lat:p2.y});}} +return length*1000;},CLASS_NAME:"OpenLayers.Geometry.Curve"});OpenLayers.Geometry.LineString=OpenLayers.Class(OpenLayers.Geometry.Curve,{initialize:function(points){OpenLayers.Geometry.Curve.prototype.initialize.apply(this,arguments);},removeComponent:function(point){var removed=this.components&&(this.components.length>2);if(removed){OpenLayers.Geometry.Collection.prototype.removeComponent.apply(this,arguments);} +return removed;},intersects:function(geometry){var intersect=false;var type=geometry.CLASS_NAME;if(type=="OpenLayers.Geometry.LineString"||type=="OpenLayers.Geometry.LinearRing"||type=="OpenLayers.Geometry.Point"){var segs1=this.getSortedSegments();var segs2;if(type=="OpenLayers.Geometry.Point"){segs2=[{x1:geometry.x,y1:geometry.y,x2:geometry.x,y2:geometry.y}];}else{segs2=geometry.getSortedSegments();} +var seg1,seg1x1,seg1x2,seg1y1,seg1y2,seg2,seg2y1,seg2y2;outer:for(var i=0,len=segs1.length;i<len;++i){seg1=segs1[i];seg1x1=seg1.x1;seg1x2=seg1.x2;seg1y1=seg1.y1;seg1y2=seg1.y2;inner:for(var j=0,jlen=segs2.length;j<jlen;++j){seg2=segs2[j];if(seg2.x1>seg1x2){break;} +if(seg2.x2<seg1x1){continue;} +seg2y1=seg2.y1;seg2y2=seg2.y2;if(Math.min(seg2y1,seg2y2)>Math.max(seg1y1,seg1y2)){continue;} +if(Math.max(seg2y1,seg2y2)<Math.min(seg1y1,seg1y2)){continue;} +if(OpenLayers.Geometry.segmentsIntersect(seg1,seg2)){intersect=true;break outer;}}}}else{intersect=geometry.intersects(this);} +return intersect;},getSortedSegments:function(){var numSeg=this.components.length-1;var segments=new Array(numSeg),point1,point2;for(var i=0;i<numSeg;++i){point1=this.components[i];point2=this.components[i+1];if(point1.x<point2.x){segments[i]={x1:point1.x,y1:point1.y,x2:point2.x,y2:point2.y};}else{segments[i]={x1:point2.x,y1:point2.y,x2:point1.x,y2:point1.y};}} +function byX1(seg1,seg2){return seg1.x1-seg2.x1;} +return segments.sort(byX1);},splitWithSegment:function(seg,options){var edge=!(options&&options.edge===false);var tolerance=options&&options.tolerance;var lines=[];var verts=this.getVertices();var points=[];var intersections=[];var split=false;var vert1,vert2,point;var node,vertex,target;var interOptions={point:true,tolerance:tolerance};var result=null;for(var i=0,stop=verts.length-2;i<=stop;++i){vert1=verts[i];points.push(vert1.clone());vert2=verts[i+1];target={x1:vert1.x,y1:vert1.y,x2:vert2.x,y2:vert2.y};point=OpenLayers.Geometry.segmentsIntersect(seg,target,interOptions);if(point instanceof OpenLayers.Geometry.Point){if((point.x===seg.x1&&point.y===seg.y1)||(point.x===seg.x2&&point.y===seg.y2)||point.equals(vert1)||point.equals(vert2)){vertex=true;}else{vertex=false;} +if(vertex||edge){if(!point.equals(intersections[intersections.length-1])){intersections.push(point.clone());} +if(i===0){if(point.equals(vert1)){continue;}} +if(point.equals(vert2)){continue;} +split=true;if(!point.equals(vert1)){points.push(point);} +lines.push(new OpenLayers.Geometry.LineString(points));points=[point.clone()];}}} +if(split){points.push(vert2.clone());lines.push(new OpenLayers.Geometry.LineString(points));} +if(intersections.length>0){var xDir=seg.x1<seg.x2?1:-1;var yDir=seg.y1<seg.y2?1:-1;result={lines:lines,points:intersections.sort(function(p1,p2){return(xDir*p1.x-xDir*p2.x)||(yDir*p1.y-yDir*p2.y);})};} +return result;},split:function(target,options){var results=null;var mutual=options&&options.mutual;var sourceSplit,targetSplit,sourceParts,targetParts;if(target instanceof OpenLayers.Geometry.LineString){var verts=this.getVertices();var vert1,vert2,seg,splits,lines,point;var points=[];sourceParts=[];for(var i=0,stop=verts.length-2;i<=stop;++i){vert1=verts[i];vert2=verts[i+1];seg={x1:vert1.x,y1:vert1.y,x2:vert2.x,y2:vert2.y};targetParts=targetParts||[target];if(mutual){points.push(vert1.clone());} +for(var j=0;j<targetParts.length;++j){splits=targetParts[j].splitWithSegment(seg,options);if(splits){lines=splits.lines;if(lines.length>0){lines.unshift(j,1);Array.prototype.splice.apply(targetParts,lines);j+=lines.length-2;} +if(mutual){for(var k=0,len=splits.points.length;k<len;++k){point=splits.points[k];if(!point.equals(vert1)){points.push(point);sourceParts.push(new OpenLayers.Geometry.LineString(points));if(point.equals(vert2)){points=[];}else{points=[point.clone()];}}}}}}} +if(mutual&&sourceParts.length>0&&points.length>0){points.push(vert2.clone());sourceParts.push(new OpenLayers.Geometry.LineString(points));}}else{results=target.splitWith(this,options);} +if(targetParts&&targetParts.length>1){targetSplit=true;}else{targetParts=[];} +if(sourceParts&&sourceParts.length>1){sourceSplit=true;}else{sourceParts=[];} +if(targetSplit||sourceSplit){if(mutual){results=[sourceParts,targetParts];}else{results=targetParts;}} +return results;},splitWith:function(geometry,options){return geometry.split(this,options);},getVertices:function(nodes){var vertices;if(nodes===true){vertices=[this.components[0],this.components[this.components.length-1]];}else if(nodes===false){vertices=this.components.slice(1,this.components.length-1);}else{vertices=this.components.slice();} +return vertices;},distanceTo:function(geometry,options){var edge=!(options&&options.edge===false);var details=edge&&options&&options.details;var result,best={};var min=Number.POSITIVE_INFINITY;if(geometry instanceof OpenLayers.Geometry.Point){var segs=this.getSortedSegments();var x=geometry.x;var y=geometry.y;var seg;for(var i=0,len=segs.length;i<len;++i){seg=segs[i];result=OpenLayers.Geometry.distanceToSegment(geometry,seg);if(result.distance<min){min=result.distance;best=result;if(min===0){break;}}else{if(seg.x2>x&&((y>seg.y1&&y<seg.y2)||(y<seg.y1&&y>seg.y2))){break;}}} +if(details){best={distance:best.distance,x0:best.x,y0:best.y,x1:x,y1:y};}else{best=best.distance;}}else if(geometry instanceof OpenLayers.Geometry.LineString){var segs0=this.getSortedSegments();var segs1=geometry.getSortedSegments();var seg0,seg1,intersection,x0,y0;var len1=segs1.length;var interOptions={point:true};outer:for(var i=0,len=segs0.length;i<len;++i){seg0=segs0[i];x0=seg0.x1;y0=seg0.y1;for(var j=0;j<len1;++j){seg1=segs1[j];intersection=OpenLayers.Geometry.segmentsIntersect(seg0,seg1,interOptions);if(intersection){min=0;best={distance:0,x0:intersection.x,y0:intersection.y,x1:intersection.x,y1:intersection.y};break outer;}else{result=OpenLayers.Geometry.distanceToSegment({x:x0,y:y0},seg1);if(result.distance<min){min=result.distance;best={distance:min,x0:x0,y0:y0,x1:result.x,y1:result.y};}}}} +if(!details){best=best.distance;} +if(min!==0){if(seg0){result=geometry.distanceTo(new OpenLayers.Geometry.Point(seg0.x2,seg0.y2),options);var dist=details?result.distance:result;if(dist<min){if(details){best={distance:min,x0:result.x1,y0:result.y1,x1:result.x0,y1:result.y0};}else{best=dist;}}}}}else{best=geometry.distanceTo(this,options);if(details){best={distance:best.distance,x0:best.x1,y0:best.y1,x1:best.x0,y1:best.y0};}} +return best;},simplify:function(tolerance){if(this&&this!==null){var points=this.getVertices();if(points.length<3){return this;} +var compareNumbers=function(a,b){return(a-b);};var douglasPeuckerReduction=function(points,firstPoint,lastPoint,tolerance){var maxDistance=0;var indexFarthest=0;for(var index=firstPoint,distance;index<lastPoint;index++){distance=perpendicularDistance(points[firstPoint],points[lastPoint],points[index]);if(distance>maxDistance){maxDistance=distance;indexFarthest=index;}} +if(maxDistance>tolerance&&indexFarthest!=firstPoint){pointIndexsToKeep.push(indexFarthest);douglasPeuckerReduction(points,firstPoint,indexFarthest,tolerance);douglasPeuckerReduction(points,indexFarthest,lastPoint,tolerance);}};var perpendicularDistance=function(point1,point2,point){var area=Math.abs(0.5*(point1.x*point2.y+point2.x*point.y+point.x*point1.y-point2.x*point1.y-point.x*point2.y-point1.x*point.y));var bottom=Math.sqrt(Math.pow(point1.x-point2.x,2)+Math.pow(point1.y-point2.y,2));var height=area/bottom*2;return height;};var firstPoint=0;var lastPoint=points.length-1;var pointIndexsToKeep=[];pointIndexsToKeep.push(firstPoint);pointIndexsToKeep.push(lastPoint);while(points[firstPoint].equals(points[lastPoint])){lastPoint--;pointIndexsToKeep.push(lastPoint);} +douglasPeuckerReduction(points,firstPoint,lastPoint,tolerance);var returnPoints=[];pointIndexsToKeep.sort(compareNumbers);for(var index=0;index<pointIndexsToKeep.length;index++){returnPoints.push(points[pointIndexsToKeep[index]]);} +return new OpenLayers.Geometry.LineString(returnPoints);} +else{return this;}},CLASS_NAME:"OpenLayers.Geometry.LineString"});OpenLayers.Geometry.LinearRing=OpenLayers.Class(OpenLayers.Geometry.LineString,{componentTypes:["OpenLayers.Geometry.Point"],initialize:function(points){OpenLayers.Geometry.LineString.prototype.initialize.apply(this,arguments);},addComponent:function(point,index){var added=false;var lastPoint=this.components.pop();if(index!=null||!point.equals(lastPoint)){added=OpenLayers.Geometry.Collection.prototype.addComponent.apply(this,arguments);} +var firstPoint=this.components[0];OpenLayers.Geometry.Collection.prototype.addComponent.apply(this,[firstPoint]);return added;},removeComponent:function(point){var removed=this.components&&(this.components.length>3);if(removed){this.components.pop();OpenLayers.Geometry.Collection.prototype.removeComponent.apply(this,arguments);var firstPoint=this.components[0];OpenLayers.Geometry.Collection.prototype.addComponent.apply(this,[firstPoint]);} +return removed;},move:function(x,y){for(var i=0,len=this.components.length;i<len-1;i++){this.components[i].move(x,y);}},rotate:function(angle,origin){for(var i=0,len=this.components.length;i<len-1;++i){this.components[i].rotate(angle,origin);}},resize:function(scale,origin,ratio){for(var i=0,len=this.components.length;i<len-1;++i){this.components[i].resize(scale,origin,ratio);} +return this;},transform:function(source,dest){if(source&&dest){for(var i=0,len=this.components.length;i<len-1;i++){var component=this.components[i];component.transform(source,dest);} +this.bounds=null;} +return this;},getCentroid:function(){if(this.components&&(this.components.length>2)){var sumX=0.0;var sumY=0.0;for(var i=0;i<this.components.length-1;i++){var b=this.components[i];var c=this.components[i+1];sumX+=(b.x+c.x)*(b.x*c.y-c.x*b.y);sumY+=(b.y+c.y)*(b.x*c.y-c.x*b.y);} +var area=-1*this.getArea();var x=sumX/(6*area);var y=sumY/(6*area);return new OpenLayers.Geometry.Point(x,y);}else{return null;}},getArea:function(){var area=0.0;if(this.components&&(this.components.length>2)){var sum=0.0;for(var i=0,len=this.components.length;i<len-1;i++){var b=this.components[i];var c=this.components[i+1];sum+=(b.x+c.x)*(c.y-b.y);} +area=-sum/2.0;} +return area;},getGeodesicArea:function(projection){var ring=this;if(projection){var gg=new OpenLayers.Projection("EPSG:4326");if(!gg.equals(projection)){ring=this.clone().transform(projection,gg);}} +var area=0.0;var len=ring.components&&ring.components.length;if(len>2){var p1,p2;for(var i=0;i<len-1;i++){p1=ring.components[i];p2=ring.components[i+1];area+=OpenLayers.Util.rad(p2.x-p1.x)*(2+Math.sin(OpenLayers.Util.rad(p1.y))+ +Math.sin(OpenLayers.Util.rad(p2.y)));} +area=area*6378137.0*6378137.0/2.0;} +return area;},containsPoint:function(point){var approx=OpenLayers.Number.limitSigDigs;var digs=14;var px=approx(point.x,digs);var py=approx(point.y,digs);function getX(y,x1,y1,x2,y2){return(((x1-x2)*y)+((x2*y1)-(x1*y2)))/(y1-y2);} +var numSeg=this.components.length-1;var start,end,x1,y1,x2,y2,cx,cy;var crosses=0;for(var i=0;i<numSeg;++i){start=this.components[i];x1=approx(start.x,digs);y1=approx(start.y,digs);end=this.components[i+1];x2=approx(end.x,digs);y2=approx(end.y,digs);if(y1==y2){if(py==y1){if(x1<=x2&&(px>=x1&&px<=x2)||x1>=x2&&(px<=x1&&px>=x2)){crosses=-1;break;}} +continue;} +cx=approx(getX(py,x1,y1,x2,y2),digs);if(cx==px){if(y1<y2&&(py>=y1&&py<=y2)||y1>y2&&(py<=y1&&py>=y2)){crosses=-1;break;}} +if(cx<=px){continue;} +if(x1!=x2&&(cx<Math.min(x1,x2)||cx>Math.max(x1,x2))){continue;} +if(y1<y2&&(py>=y1&&py<y2)||y1>y2&&(py<y1&&py>=y2)){++crosses;}} +var contained=(crosses==-1)?1:!!(crosses&1);return contained;},intersects:function(geometry){var intersect=false;if(geometry.CLASS_NAME=="OpenLayers.Geometry.Point"){intersect=this.containsPoint(geometry);}else if(geometry.CLASS_NAME=="OpenLayers.Geometry.LineString"){intersect=geometry.intersects(this);}else if(geometry.CLASS_NAME=="OpenLayers.Geometry.LinearRing"){intersect=OpenLayers.Geometry.LineString.prototype.intersects.apply(this,[geometry]);}else{for(var i=0,len=geometry.components.length;i<len;++i){intersect=geometry.components[i].intersects(this);if(intersect){break;}}} +return intersect;},getVertices:function(nodes){return(nodes===true)?[]:this.components.slice(0,this.components.length-1);},CLASS_NAME:"OpenLayers.Geometry.LinearRing"});OpenLayers.Renderer=OpenLayers.Class({container:null,root:null,extent:null,locked:false,size:null,resolution:null,map:null,initialize:function(containerID,options){this.container=OpenLayers.Util.getElement(containerID);OpenLayers.Util.extend(this,options);},destroy:function(){this.container=null;this.extent=null;this.size=null;this.resolution=null;this.map=null;},supported:function(){return false;},setExtent:function(extent,resolutionChanged){this.extent=extent.clone();if(resolutionChanged){this.resolution=null;}},setSize:function(size){this.size=size.clone();this.resolution=null;},getResolution:function(){this.resolution=this.resolution||this.map.getResolution();return this.resolution;},drawFeature:function(feature,style){if(style==null){style=feature.style;} +if(feature.geometry){var bounds=feature.geometry.getBounds();if(bounds){if(!bounds.intersectsBounds(this.extent)){style={display:"none"};} +var rendered=this.drawGeometry(feature.geometry,style,feature.id);if(style.display!="none"&&style.label&&rendered!==false){var location=feature.geometry.getCentroid();if(style.labelXOffset||style.labelYOffset){var xOffset=isNaN(style.labelXOffset)?0:style.labelXOffset;var yOffset=isNaN(style.labelYOffset)?0:style.labelYOffset;var res=this.getResolution();location.move(xOffset*res,yOffset*res);} +this.drawText(feature.id,style,location);}else{this.removeText(feature.id);} +return rendered;}}},drawGeometry:function(geometry,style,featureId){},drawText:function(featureId,style,location){},removeText:function(featureId){},clear:function(){},getFeatureIdFromEvent:function(evt){},eraseFeatures:function(features){if(!(OpenLayers.Util.isArray(features))){features=[features];} +for(var i=0,len=features.length;i<len;++i){var feature=features[i];this.eraseGeometry(feature.geometry,feature.id);this.removeText(feature.id);}},eraseGeometry:function(geometry,featureId){},moveRoot:function(renderer){},getRenderLayerId:function(){return this.container.id;},applyDefaultSymbolizer:function(symbolizer){var result=OpenLayers.Util.extend({},OpenLayers.Renderer.defaultSymbolizer);if(symbolizer.stroke===false){delete result.strokeWidth;delete result.strokeColor;} +if(symbolizer.fill===false){delete result.fillColor;} +OpenLayers.Util.extend(result,symbolizer);return result;},CLASS_NAME:"OpenLayers.Renderer"});OpenLayers.Renderer.defaultSymbolizer={fillColor:"#000000",strokeColor:"#000000",strokeWidth:2,fillOpacity:1,strokeOpacity:1,pointRadius:0};OpenLayers.Renderer.Canvas=OpenLayers.Class(OpenLayers.Renderer,{hitDetection:true,hitOverflow:0,canvas:null,features:null,pendingRedraw:false,initialize:function(containerID,options){OpenLayers.Renderer.prototype.initialize.apply(this,arguments);this.root=document.createElement("canvas");this.container.appendChild(this.root);this.canvas=this.root.getContext("2d");this.features={};if(this.hitDetection){this.hitCanvas=document.createElement("canvas");this.hitContext=this.hitCanvas.getContext("2d");}},eraseGeometry:function(geometry,featureId){this.eraseFeatures(this.features[featureId][0]);},supported:function(){var canvas=document.createElement("canvas");return!!canvas.getContext;},setSize:function(size){this.size=size.clone();var root=this.root;root.style.width=size.w+"px";root.style.height=size.h+"px";root.width=size.w;root.height=size.h;this.resolution=null;if(this.hitDetection){var hitCanvas=this.hitCanvas;hitCanvas.style.width=size.w+"px";hitCanvas.style.height=size.h+"px";hitCanvas.width=size.w;hitCanvas.height=size.h;}},drawFeature:function(feature,style){var rendered;if(feature.geometry){style=this.applyDefaultSymbolizer(style||feature.style);var bounds=feature.geometry.getBounds();rendered=(style.display!=="none")&&!!bounds&&bounds.intersectsBounds(this.extent);if(rendered){this.features[feature.id]=[feature,style];} +else{delete(this.features[feature.id]);} +this.pendingRedraw=true;} +if(this.pendingRedraw&&!this.locked){this.redraw();this.pendingRedraw=false;} +return rendered;},drawGeometry:function(geometry,style,featureId){var className=geometry.CLASS_NAME;if((className=="OpenLayers.Geometry.Collection")||(className=="OpenLayers.Geometry.MultiPoint")||(className=="OpenLayers.Geometry.MultiLineString")||(className=="OpenLayers.Geometry.MultiPolygon")){for(var i=0;i<geometry.components.length;i++){this.drawGeometry(geometry.components[i],style,featureId);} +return;} +switch(geometry.CLASS_NAME){case"OpenLayers.Geometry.Point":this.drawPoint(geometry,style,featureId);break;case"OpenLayers.Geometry.LineString":this.drawLineString(geometry,style,featureId);break;case"OpenLayers.Geometry.LinearRing":this.drawLinearRing(geometry,style,featureId);break;case"OpenLayers.Geometry.Polygon":this.drawPolygon(geometry,style,featureId);break;default:break;}},drawExternalGraphic:function(geometry,style,featureId){var img=new Image();if(style.graphicTitle){img.title=style.graphicTitle;} +var width=style.graphicWidth||style.graphicHeight;var height=style.graphicHeight||style.graphicWidth;width=width?width:style.pointRadius*2;height=height?height:style.pointRadius*2;var xOffset=(style.graphicXOffset!=undefined)?style.graphicXOffset:-(0.5*width);var yOffset=(style.graphicYOffset!=undefined)?style.graphicYOffset:-(0.5*height);var opacity=style.graphicOpacity||style.fillOpacity;var onLoad=function(){if(!this.features[featureId]){return;} +var pt=this.getLocalXY(geometry);var p0=pt[0];var p1=pt[1];if(!isNaN(p0)&&!isNaN(p1)){var x=(p0+xOffset)|0;var y=(p1+yOffset)|0;var canvas=this.canvas;canvas.globalAlpha=opacity;var factor=OpenLayers.Renderer.Canvas.drawImageScaleFactor||(OpenLayers.Renderer.Canvas.drawImageScaleFactor=/android 2.1/.test(navigator.userAgent.toLowerCase())?320/window.screen.width:1);canvas.drawImage(img,x*factor,y*factor,width*factor,height*factor);if(this.hitDetection){this.setHitContextStyle("fill",featureId);this.hitContext.fillRect(x,y,width,height);}}};img.onload=OpenLayers.Function.bind(onLoad,this);img.src=style.externalGraphic;},setCanvasStyle:function(type,style){if(type==="fill"){this.canvas.globalAlpha=style['fillOpacity'];this.canvas.fillStyle=style['fillColor'];}else if(type==="stroke"){this.canvas.globalAlpha=style['strokeOpacity'];this.canvas.strokeStyle=style['strokeColor'];this.canvas.lineWidth=style['strokeWidth'];}else{this.canvas.globalAlpha=0;this.canvas.lineWidth=1;}},featureIdToHex:function(featureId){var id=Number(featureId.split("_").pop())+1;if(id>=16777216){this.hitOverflow=id-16777215;id=id%16777216+1;} +var hex="000000"+id.toString(16);var len=hex.length;hex="#"+hex.substring(len-6,len);return hex;},setHitContextStyle:function(type,featureId,symbolizer){var hex=this.featureIdToHex(featureId);if(type=="fill"){this.hitContext.globalAlpha=1.0;this.hitContext.fillStyle=hex;}else if(type=="stroke"){this.hitContext.globalAlpha=1.0;this.hitContext.strokeStyle=hex;this.hitContext.lineWidth=symbolizer.strokeWidth+2;}else{this.hitContext.globalAlpha=0;this.hitContext.lineWidth=1;}},drawPoint:function(geometry,style,featureId){if(style.graphic!==false){if(style.externalGraphic){this.drawExternalGraphic(geometry,style,featureId);}else{var pt=this.getLocalXY(geometry);var p0=pt[0];var p1=pt[1];if(!isNaN(p0)&&!isNaN(p1)){var twoPi=Math.PI*2;var radius=style.pointRadius;if(style.fill!==false){this.setCanvasStyle("fill",style);this.canvas.beginPath();this.canvas.arc(p0,p1,radius,0,twoPi,true);this.canvas.fill();if(this.hitDetection){this.setHitContextStyle("fill",featureId,style);this.hitContext.beginPath();this.hitContext.arc(p0,p1,radius,0,twoPi,true);this.hitContext.fill();}} +if(style.stroke!==false){this.setCanvasStyle("stroke",style);this.canvas.beginPath();this.canvas.arc(p0,p1,radius,0,twoPi,true);this.canvas.stroke();if(this.hitDetection){this.setHitContextStyle("stroke",featureId,style);this.hitContext.beginPath();this.hitContext.arc(p0,p1,radius,0,twoPi,true);this.hitContext.stroke();} +this.setCanvasStyle("reset");}}}}},drawLineString:function(geometry,style,featureId){style=OpenLayers.Util.applyDefaults({fill:false},style);this.drawLinearRing(geometry,style,featureId);},drawLinearRing:function(geometry,style,featureId){if(style.fill!==false){this.setCanvasStyle("fill",style);this.renderPath(this.canvas,geometry,style,featureId,"fill");if(this.hitDetection){this.setHitContextStyle("fill",featureId,style);this.renderPath(this.hitContext,geometry,style,featureId,"fill");}} +if(style.stroke!==false){this.setCanvasStyle("stroke",style);this.renderPath(this.canvas,geometry,style,featureId,"stroke");if(this.hitDetection){this.setHitContextStyle("stroke",featureId,style);this.renderPath(this.hitContext,geometry,style,featureId,"stroke");}} +this.setCanvasStyle("reset");},renderPath:function(context,geometry,style,featureId,type){var components=geometry.components;var len=components.length;context.beginPath();var start=this.getLocalXY(components[0]);var x=start[0];var y=start[1];if(!isNaN(x)&&!isNaN(y)){context.moveTo(start[0],start[1]);for(var i=1;i<len;++i){var pt=this.getLocalXY(components[i]);context.lineTo(pt[0],pt[1]);} +if(type==="fill"){context.fill();}else{context.stroke();}}},drawPolygon:function(geometry,style,featureId){var components=geometry.components;var len=components.length;this.drawLinearRing(components[0],style,featureId);for(var i=1;i<len;++i){this.canvas.globalCompositeOperation="destination-out";if(this.hitDetection){this.hitContext.globalCompositeOperation="destination-out";} +this.drawLinearRing(components[i],OpenLayers.Util.applyDefaults({stroke:false,fillOpacity:1.0},style),featureId);this.canvas.globalCompositeOperation="source-over";if(this.hitDetection){this.hitContext.globalCompositeOperation="source-over";} +this.drawLinearRing(components[i],OpenLayers.Util.applyDefaults({fill:false},style),featureId);}},drawText:function(location,style){style=OpenLayers.Util.extend({fontColor:"#000000",labelAlign:"cm"},style);var pt=this.getLocalXY(location);this.setCanvasStyle("reset");this.canvas.fillStyle=style.fontColor;this.canvas.globalAlpha=style.fontOpacity||1.0;var fontStyle=[style.fontStyle?style.fontStyle:"normal","normal",style.fontWeight?style.fontWeight:"normal",style.fontSize?style.fontSize:"1em",style.fontFamily?style.fontFamily:"sans-serif"].join(" ");var labelRows=style.label.split('\n');var numRows=labelRows.length;if(this.canvas.fillText){this.canvas.font=fontStyle;this.canvas.textAlign=OpenLayers.Renderer.Canvas.LABEL_ALIGN[style.labelAlign[0]]||"center";this.canvas.textBaseline=OpenLayers.Renderer.Canvas.LABEL_ALIGN[style.labelAlign[1]]||"middle";var vfactor=OpenLayers.Renderer.Canvas.LABEL_FACTOR[style.labelAlign[1]];if(vfactor==null){vfactor=-.5;} +var lineHeight=this.canvas.measureText('Mg').height||this.canvas.measureText('xx').width;pt[1]+=lineHeight*vfactor*(numRows-1);for(var i=0;i<numRows;i++){this.canvas.fillText(labelRows[i],pt[0],pt[1]+(lineHeight*i));}}else if(this.canvas.mozDrawText){this.canvas.mozTextStyle=fontStyle;var hfactor=OpenLayers.Renderer.Canvas.LABEL_FACTOR[style.labelAlign[0]];if(hfactor==null){hfactor=-.5;} +var vfactor=OpenLayers.Renderer.Canvas.LABEL_FACTOR[style.labelAlign[1]];if(vfactor==null){vfactor=-.5;} +var lineHeight=this.canvas.mozMeasureText('xx');pt[1]+=lineHeight*(1+(vfactor*numRows));for(var i=0;i<numRows;i++){var x=pt[0]+(hfactor*this.canvas.mozMeasureText(labelRows[i]));var y=pt[1]+(i*lineHeight);this.canvas.translate(x,y);this.canvas.mozDrawText(labelRows[i]);this.canvas.translate(-x,-y);}} +this.setCanvasStyle("reset");},getLocalXY:function(point){var resolution=this.getResolution();var extent=this.extent;var x=(point.x/resolution+(-extent.left/resolution));var y=((extent.top/resolution)-point.y/resolution);return[x,y];},clear:function(){var height=this.root.height;var width=this.root.width;this.canvas.clearRect(0,0,width,height);this.features={};if(this.hitDetection){this.hitContext.clearRect(0,0,width,height);}},getFeatureIdFromEvent:function(evt){var feature=null;if(this.hitDetection){if(!this.map.dragging){var xy=evt.xy;var x=xy.x|0;var y=xy.y|0;var data=this.hitContext.getImageData(x,y,1,1).data;if(data[3]===255){var id=data[2]+(256*(data[1]+(256*data[0])));if(id){feature=this.features["OpenLayers.Feature.Vector_"+(id-1+this.hitOverflow)][0];}}}} +return feature;},eraseFeatures:function(features){if(!(OpenLayers.Util.isArray(features))){features=[features];} +for(var i=0;i<features.length;++i){delete this.features[features[i].id];} +this.redraw();},redraw:function(){if(!this.locked){var height=this.root.height;var width=this.root.width;this.canvas.clearRect(0,0,width,height);if(this.hitDetection){this.hitContext.clearRect(0,0,width,height);} +var labelMap=[];var feature,style;for(var id in this.features){if(!this.features.hasOwnProperty(id)){continue;} +feature=this.features[id][0];style=this.features[id][1];this.drawGeometry(feature.geometry,style,feature.id);if(style.label){labelMap.push([feature,style]);}} +var item;for(var i=0,len=labelMap.length;i<len;++i){item=labelMap[i];this.drawText(item[0].geometry.getCentroid(),item[1]);}}},CLASS_NAME:"OpenLayers.Renderer.Canvas"});OpenLayers.Renderer.Canvas.LABEL_ALIGN={"l":"left","r":"right","t":"top","b":"bottom"};OpenLayers.Renderer.Canvas.LABEL_FACTOR={"l":0,"r":-1,"t":0,"b":-1};OpenLayers.Renderer.Canvas.drawImageScaleFactor=null;OpenLayers.Event={observers:false,KEY_BACKSPACE:8,KEY_TAB:9,KEY_RETURN:13,KEY_ESC:27,KEY_LEFT:37,KEY_UP:38,KEY_RIGHT:39,KEY_DOWN:40,KEY_DELETE:46,element:function(event){return event.target||event.srcElement;},isSingleTouch:function(event){return event.touches&&event.touches.length==1;},isMultiTouch:function(event){return event.touches&&event.touches.length>1;},isLeftClick:function(event){return(((event.which)&&(event.which==1))||((event.button)&&(event.button==1)));},isRightClick:function(event){return(((event.which)&&(event.which==3))||((event.button)&&(event.button==2)));},stop:function(event,allowDefault){if(!allowDefault){if(event.preventDefault){event.preventDefault();}else{event.returnValue=false;}} +if(event.stopPropagation){event.stopPropagation();}else{event.cancelBubble=true;}},findElement:function(event,tagName){var element=OpenLayers.Event.element(event);while(element.parentNode&&(!element.tagName||(element.tagName.toUpperCase()!=tagName.toUpperCase()))){element=element.parentNode;} +return element;},observe:function(elementParam,name,observer,useCapture){var element=OpenLayers.Util.getElement(elementParam);useCapture=useCapture||false;if(name=='keypress'&&(navigator.appVersion.match(/Konqueror|Safari|KHTML/)||element.attachEvent)){name='keydown';} +if(!this.observers){this.observers={};} +if(!element._eventCacheID){var idPrefix="eventCacheID_";if(element.id){idPrefix=element.id+"_"+idPrefix;} +element._eventCacheID=OpenLayers.Util.createUniqueID(idPrefix);} +var cacheID=element._eventCacheID;if(!this.observers[cacheID]){this.observers[cacheID]=[];} +this.observers[cacheID].push({'element':element,'name':name,'observer':observer,'useCapture':useCapture});if(element.addEventListener){element.addEventListener(name,observer,useCapture);}else if(element.attachEvent){element.attachEvent('on'+name,observer);}},stopObservingElement:function(elementParam){var element=OpenLayers.Util.getElement(elementParam);var cacheID=element._eventCacheID;this._removeElementObservers(OpenLayers.Event.observers[cacheID]);},_removeElementObservers:function(elementObservers){if(elementObservers){for(var i=elementObservers.length-1;i>=0;i--){var entry=elementObservers[i];var args=new Array(entry.element,entry.name,entry.observer,entry.useCapture);var removed=OpenLayers.Event.stopObserving.apply(this,args);}}},stopObserving:function(elementParam,name,observer,useCapture){useCapture=useCapture||false;var element=OpenLayers.Util.getElement(elementParam);var cacheID=element._eventCacheID;if(name=='keypress'){if(navigator.appVersion.match(/Konqueror|Safari|KHTML/)||element.detachEvent){name='keydown';}} +var foundEntry=false;var elementObservers=OpenLayers.Event.observers[cacheID];if(elementObservers){var i=0;while(!foundEntry&&i<elementObservers.length){var cacheEntry=elementObservers[i];if((cacheEntry.name==name)&&(cacheEntry.observer==observer)&&(cacheEntry.useCapture==useCapture)){elementObservers.splice(i,1);if(elementObservers.length==0){delete OpenLayers.Event.observers[cacheID];} +foundEntry=true;break;} +i++;}} +if(foundEntry){if(element.removeEventListener){element.removeEventListener(name,observer,useCapture);}else if(element&&element.detachEvent){element.detachEvent('on'+name,observer);}} +return foundEntry;},unloadCache:function(){if(OpenLayers.Event&&OpenLayers.Event.observers){for(var cacheID in OpenLayers.Event.observers){var elementObservers=OpenLayers.Event.observers[cacheID];OpenLayers.Event._removeElementObservers.apply(this,[elementObservers]);} +OpenLayers.Event.observers=false;}},CLASS_NAME:"OpenLayers.Event"};OpenLayers.Event.observe(window,'unload',OpenLayers.Event.unloadCache,false);if(window.Event){OpenLayers.Util.applyDefaults(window.Event,OpenLayers.Event);}else{var Event=OpenLayers.Event;} +OpenLayers.Events=OpenLayers.Class({BROWSER_EVENTS:["mouseover","mouseout","mousedown","mouseup","mousemove","click","dblclick","rightclick","dblrightclick","resize","focus","blur","touchstart","touchmove","touchend"],listeners:null,object:null,element:null,eventTypes:null,eventHandler:null,fallThrough:null,includeXY:false,clearMouseListener:null,initialize:function(object,element,eventTypes,fallThrough,options){OpenLayers.Util.extend(this,options);this.object=object;this.fallThrough=fallThrough;this.listeners={};this.eventHandler=OpenLayers.Function.bindAsEventListener(this.handleBrowserEvent,this);this.clearMouseListener=OpenLayers.Function.bind(this.clearMouseCache,this);this.eventTypes=[];if(eventTypes!=null){for(var i=0,len=eventTypes.length;i<len;i++){this.addEventType(eventTypes[i]);}} +if(element!=null){this.attachToElement(element);}},destroy:function(){if(this.element){OpenLayers.Event.stopObservingElement(this.element);if(this.element.hasScrollEvent){OpenLayers.Event.stopObserving(window,"scroll",this.clearMouseListener);}} +this.element=null;this.listeners=null;this.object=null;this.eventTypes=null;this.fallThrough=null;this.eventHandler=null;},addEventType:function(eventName){if(!this.listeners[eventName]){this.eventTypes.push(eventName);this.listeners[eventName]=[];}},attachToElement:function(element){if(this.element){OpenLayers.Event.stopObservingElement(this.element);} +this.element=element;for(var i=0,len=this.BROWSER_EVENTS.length;i<len;i++){var eventType=this.BROWSER_EVENTS[i];this.addEventType(eventType);OpenLayers.Event.observe(element,eventType,this.eventHandler);} +OpenLayers.Event.observe(element,"dragstart",OpenLayers.Event.stop);},on:function(object){for(var type in object){if(type!="scope"){this.register(type,object.scope,object[type]);}}},register:function(type,obj,func){if((func!=null)&&(OpenLayers.Util.indexOf(this.eventTypes,type)!=-1)){if(obj==null){obj=this.object;} +var listeners=this.listeners[type];listeners.push({obj:obj,func:func});}},registerPriority:function(type,obj,func){if(func!=null){if(obj==null){obj=this.object;} +var listeners=this.listeners[type];if(listeners!=null){listeners.unshift({obj:obj,func:func});}}},un:function(object){for(var type in object){if(type!="scope"){this.unregister(type,object.scope,object[type]);}}},unregister:function(type,obj,func){if(obj==null){obj=this.object;} +var listeners=this.listeners[type];if(listeners!=null){for(var i=0,len=listeners.length;i<len;i++){if(listeners[i].obj==obj&&listeners[i].func==func){listeners.splice(i,1);break;}}}},remove:function(type){if(this.listeners[type]!=null){this.listeners[type]=[];}},triggerEvent:function(type,evt){var listeners=this.listeners[type];if(!listeners||listeners.length==0){return undefined;} +if(evt==null){evt={};} +evt.object=this.object;evt.element=this.element;if(!evt.type){evt.type=type;} +listeners=listeners.slice();var continueChain;for(var i=0,len=listeners.length;i<len;i++){var callback=listeners[i];continueChain=callback.func.apply(callback.obj,[evt]);if((continueChain!=undefined)&&(continueChain==false)){break;}} +if(!this.fallThrough){OpenLayers.Event.stop(evt,true);} +return continueChain;},handleBrowserEvent:function(evt){var type=evt.type,listeners=this.listeners[type];if(!listeners||listeners.length==0){return;} +var touches=evt.touches;if(touches&&touches[0]){var x=0;var y=0;var num=touches.length;var touch;for(var i=0;i<num;++i){touch=touches[i];x+=touch.clientX;y+=touch.clientY;} +evt.clientX=x/num;evt.clientY=y/num;} +if(this.includeXY){evt.xy=this.getMousePosition(evt);} +this.triggerEvent(type,evt);},clearMouseCache:function(){this.element.scrolls=null;this.element.lefttop=null;var body=document.body;if(body&&!((body.scrollTop!=0||body.scrollLeft!=0)&&navigator.userAgent.match(/iPhone/i))){this.element.offsets=null;}},getMousePosition:function(evt){if(!this.includeXY){this.clearMouseCache();}else if(!this.element.hasScrollEvent){OpenLayers.Event.observe(window,"scroll",this.clearMouseListener);this.element.hasScrollEvent=true;} +if(!this.element.scrolls){var viewportElement=OpenLayers.Util.getViewportElement();this.element.scrolls=[viewportElement.scrollLeft,viewportElement.scrollTop];} +if(!this.element.lefttop){this.element.lefttop=[(document.documentElement.clientLeft||0),(document.documentElement.clientTop||0)];} +if(!this.element.offsets){this.element.offsets=OpenLayers.Util.pagePosition(this.element);} +return new OpenLayers.Pixel((evt.clientX+this.element.scrolls[0])-this.element.offsets[0] +-this.element.lefttop[0],(evt.clientY+this.element.scrolls[1])-this.element.offsets[1] +-this.element.lefttop[1]);},CLASS_NAME:"OpenLayers.Events"});OpenLayers.Handler=OpenLayers.Class({id:null,control:null,map:null,keyMask:null,active:false,evt:null,initialize:function(control,callbacks,options){OpenLayers.Util.extend(this,options);this.control=control;this.callbacks=callbacks;var map=this.map||control.map;if(map){this.setMap(map);} +this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_");},setMap:function(map){this.map=map;},checkModifiers:function(evt){if(this.keyMask==null){return true;} +var keyModifiers=(evt.shiftKey?OpenLayers.Handler.MOD_SHIFT:0)|(evt.ctrlKey?OpenLayers.Handler.MOD_CTRL:0)|(evt.altKey?OpenLayers.Handler.MOD_ALT:0);return(keyModifiers==this.keyMask);},activate:function(){if(this.active){return false;} +var events=OpenLayers.Events.prototype.BROWSER_EVENTS;for(var i=0,len=events.length;i<len;i++){if(this[events[i]]){this.register(events[i],this[events[i]]);}} +this.active=true;return true;},deactivate:function(){if(!this.active){return false;} +var events=OpenLayers.Events.prototype.BROWSER_EVENTS;for(var i=0,len=events.length;i<len;i++){if(this[events[i]]){this.unregister(events[i],this[events[i]]);}} +this.active=false;return true;},callback:function(name,args){if(name&&this.callbacks[name]){this.callbacks[name].apply(this.control,args);}},register:function(name,method){this.map.events.registerPriority(name,this,method);this.map.events.registerPriority(name,this,this.setEvent);},unregister:function(name,method){this.map.events.unregister(name,this,method);this.map.events.unregister(name,this,this.setEvent);},setEvent:function(evt){this.evt=evt;return true;},destroy:function(){this.deactivate();this.control=this.map=null;},CLASS_NAME:"OpenLayers.Handler"});OpenLayers.Handler.MOD_NONE=0;OpenLayers.Handler.MOD_SHIFT=1;OpenLayers.Handler.MOD_CTRL=2;OpenLayers.Handler.MOD_ALT=4;OpenLayers.Handler.MouseWheel=OpenLayers.Class(OpenLayers.Handler,{wheelListener:null,mousePosition:null,interval:0,delta:0,cumulative:true,initialize:function(control,callbacks,options){OpenLayers.Handler.prototype.initialize.apply(this,arguments);this.wheelListener=OpenLayers.Function.bindAsEventListener(this.onWheelEvent,this);},destroy:function(){OpenLayers.Handler.prototype.destroy.apply(this,arguments);this.wheelListener=null;},onWheelEvent:function(e){if(!this.map||!this.checkModifiers(e)){return;} +var overScrollableDiv=false;var overLayerDiv=false;var overMapDiv=false;var elem=OpenLayers.Event.element(e);while((elem!=null)&&!overMapDiv&&!overScrollableDiv){if(!overScrollableDiv){try{if(elem.currentStyle){overflow=elem.currentStyle["overflow"];}else{var style=document.defaultView.getComputedStyle(elem,null);var overflow=style.getPropertyValue("overflow");} +overScrollableDiv=(overflow&&(overflow=="auto")||(overflow=="scroll"));}catch(err){}} +if(!overLayerDiv){for(var i=0,len=this.map.layers.length;i<len;i++){if(elem==this.map.layers[i].div||elem==this.map.layers[i].pane){overLayerDiv=true;break;}}} +overMapDiv=(elem==this.map.div);elem=elem.parentNode;} +if(!overScrollableDiv&&overMapDiv){if(overLayerDiv){var delta=0;if(!e){e=window.event;} +if(e.wheelDelta){delta=e.wheelDelta/120;if(window.opera&&window.opera.version()<9.2){delta=-delta;}}else if(e.detail){delta=-e.detail/3;} +this.delta=this.delta+delta;if(this.interval){window.clearTimeout(this._timeoutId);this._timeoutId=window.setTimeout(OpenLayers.Function.bind(function(){this.wheelZoom(e);},this),this.interval);}else{this.wheelZoom(e);}} +OpenLayers.Event.stop(e);}},wheelZoom:function(e){var delta=this.delta;this.delta=0;if(delta){if(this.mousePosition){e.xy=this.mousePosition;} +if(!e.xy){e.xy=this.map.getPixelFromLonLat(this.map.getCenter());} +if(delta<0){this.callback("down",[e,this.cumulative?delta:-1]);}else{this.callback("up",[e,this.cumulative?delta:1]);}}},mousemove:function(evt){this.mousePosition=evt.xy;},activate:function(evt){if(OpenLayers.Handler.prototype.activate.apply(this,arguments)){var wheelListener=this.wheelListener;OpenLayers.Event.observe(window,"DOMMouseScroll",wheelListener);OpenLayers.Event.observe(window,"mousewheel",wheelListener);OpenLayers.Event.observe(document,"mousewheel",wheelListener);return true;}else{return false;}},deactivate:function(evt){if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){var wheelListener=this.wheelListener;OpenLayers.Event.stopObserving(window,"DOMMouseScroll",wheelListener);OpenLayers.Event.stopObserving(window,"mousewheel",wheelListener);OpenLayers.Event.stopObserving(document,"mousewheel",wheelListener);return true;}else{return false;}},CLASS_NAME:"OpenLayers.Handler.MouseWheel"});OpenLayers.Symbolizer=OpenLayers.Class({zIndex:0,initialize:function(config){OpenLayers.Util.extend(this,config);},clone:function(){var Type=eval(this.CLASS_NAME);return new Type(OpenLayers.Util.extend({},this));},CLASS_NAME:"OpenLayers.Symbolizer"});OpenLayers.Symbolizer.Raster=OpenLayers.Class(OpenLayers.Symbolizer,{initialize:function(config){OpenLayers.Symbolizer.prototype.initialize.apply(this,arguments);},CLASS_NAME:"OpenLayers.Symbolizer.Raster"});OpenLayers.Tile=OpenLayers.Class({EVENT_TYPES:["loadstart","loadend","reload","unload"],events:null,id:null,layer:null,url:null,bounds:null,size:null,position:null,isLoading:false,initialize:function(layer,position,bounds,url,size,options){this.layer=layer;this.position=position.clone();this.bounds=bounds.clone();this.url=url;if(size){this.size=size.clone();} +this.id=OpenLayers.Util.createUniqueID("Tile_");this.events=new OpenLayers.Events(this,null,this.EVENT_TYPES);OpenLayers.Util.extend(this,options);},unload:function(){if(this.isLoading){this.isLoading=false;this.events.triggerEvent("unload");}},destroy:function(){this.layer=null;this.bounds=null;this.size=null;this.position=null;this.events.destroy();this.events=null;},clone:function(obj){if(obj==null){obj=new OpenLayers.Tile(this.layer,this.position,this.bounds,this.url,this.size);} +OpenLayers.Util.applyDefaults(obj,this);return obj;},draw:function(){var maxExtent=this.layer.maxExtent;var withinMaxExtent=(maxExtent&&this.bounds.intersectsBounds(maxExtent,false));this.shouldDraw=(withinMaxExtent||this.layer.displayOutsideMaxExtent);this.clear();return this.shouldDraw;},moveTo:function(bounds,position,redraw){if(redraw==null){redraw=true;} +this.bounds=bounds.clone();this.position=position.clone();if(redraw){this.draw();}},clear:function(){},getBoundsFromBaseLayer:function(position){var msg=OpenLayers.i18n('reprojectDeprecated',{'layerName':this.layer.name});OpenLayers.Console.warn(msg);var topLeft=this.layer.map.getLonLatFromLayerPx(position);var bottomRightPx=position.clone();bottomRightPx.x+=this.size.w;bottomRightPx.y+=this.size.h;var bottomRight=this.layer.map.getLonLatFromLayerPx(bottomRightPx);if(topLeft.lon>bottomRight.lon){if(topLeft.lon<0){topLeft.lon=-180-(topLeft.lon+180);}else{bottomRight.lon=180+bottomRight.lon+180;}} +var bounds=new OpenLayers.Bounds(topLeft.lon,bottomRight.lat,bottomRight.lon,topLeft.lat);return bounds;},showTile:function(){if(this.shouldDraw){this.show();}},show:function(){},hide:function(){},CLASS_NAME:"OpenLayers.Tile"});OpenLayers.Tile.Image=OpenLayers.Class(OpenLayers.Tile,{url:null,imgDiv:null,frame:null,layerAlphaHack:null,isBackBuffer:false,isFirstDraw:true,backBufferTile:null,maxGetUrlLength:null,initialize:function(layer,position,bounds,url,size,options){OpenLayers.Tile.prototype.initialize.apply(this,arguments);if(this.maxGetUrlLength!=null){OpenLayers.Util.extend(this,OpenLayers.Tile.Image.IFrame);} +this.url=url;this.frame=document.createElement('div');this.frame.style.overflow='hidden';this.frame.style.position='absolute';this.layerAlphaHack=this.layer.alpha&&OpenLayers.Util.alphaHack();},destroy:function(){if(this.imgDiv!=null){this.removeImgDiv();} +this.imgDiv=null;if((this.frame!=null)&&(this.frame.parentNode==this.layer.div)){this.layer.div.removeChild(this.frame);} +this.frame=null;if(this.backBufferTile){this.backBufferTile.destroy();this.backBufferTile=null;} +this.layer.events.unregister("loadend",this,this.resetBackBuffer);OpenLayers.Tile.prototype.destroy.apply(this,arguments);},clone:function(obj){if(obj==null){obj=new OpenLayers.Tile.Image(this.layer,this.position,this.bounds,this.url,this.size);} +obj=OpenLayers.Tile.prototype.clone.apply(this,[obj]);obj.imgDiv=null;return obj;},draw:function(){if(this.layer!=this.layer.map.baseLayer&&this.layer.reproject){this.bounds=this.getBoundsFromBaseLayer(this.position);} +var drawTile=OpenLayers.Tile.prototype.draw.apply(this,arguments);if((OpenLayers.Util.indexOf(this.layer.SUPPORTED_TRANSITIONS,this.layer.transitionEffect)!=-1)||this.layer.singleTile){if(drawTile){if(!this.backBufferTile){this.backBufferTile=this.clone();this.backBufferTile.hide();this.backBufferTile.isBackBuffer=true;this.events.register('loadend',this,this.resetBackBuffer);this.layer.events.register("loadend",this,this.resetBackBuffer);} +this.startTransition();}else{if(this.backBufferTile){this.backBufferTile.clear();}}}else{if(drawTile&&this.isFirstDraw){this.events.register('loadend',this,this.showTile);this.isFirstDraw=false;}} +if(!drawTile){return false;} +if(this.isLoading){this.events.triggerEvent("reload");}else{this.isLoading=true;this.events.triggerEvent("loadstart");} +return this.renderTile();},resetBackBuffer:function(){this.showTile();if(this.backBufferTile&&(this.isFirstDraw||!this.layer.numLoadingTiles)){this.isFirstDraw=false;var maxExtent=this.layer.maxExtent;var withinMaxExtent=(maxExtent&&this.bounds.intersectsBounds(maxExtent,false));if(withinMaxExtent){this.backBufferTile.position=this.position;this.backBufferTile.bounds=this.bounds;this.backBufferTile.size=this.size;this.backBufferTile.imageSize=this.layer.getImageSize(this.bounds)||this.size;this.backBufferTile.imageOffset=this.layer.imageOffset;this.backBufferTile.resolution=this.layer.getResolution();this.backBufferTile.renderTile();} +this.backBufferTile.hide();}},renderTile:function(){if(this.layer.async){this.initImgDiv();this.layer.getURLasync(this.bounds,this,"url",this.positionImage);}else{this.url=this.layer.getURL(this.bounds);this.initImgDiv();this.positionImage();} +return true;},positionImage:function(){if(this.layer===null){return;} +OpenLayers.Util.modifyDOMElement(this.frame,null,this.position,this.size);var imageSize=this.layer.getImageSize(this.bounds);if(this.layerAlphaHack){OpenLayers.Util.modifyAlphaImageDiv(this.imgDiv,null,null,imageSize,this.url);}else{OpenLayers.Util.modifyDOMElement(this.imgDiv,null,null,imageSize);this.imgDiv.src=this.url;}},clear:function(){if(this.imgDiv){this.hide();if(OpenLayers.Tile.Image.useBlankTile){this.imgDiv.src=OpenLayers.Util.getImagesLocation()+"blank.gif";}}},initImgDiv:function(){if(this.imgDiv==null){var offset=this.layer.imageOffset;var size=this.layer.getImageSize(this.bounds);if(this.layerAlphaHack){this.imgDiv=OpenLayers.Util.createAlphaImageDiv(null,offset,size,null,"relative",null,null,null,true);}else{this.imgDiv=OpenLayers.Util.createImage(null,offset,size,null,"relative",null,null,true);} +if(OpenLayers.Util.isArray(this.layer.url)){this.imgDiv.urls=this.layer.url.slice();} +this.imgDiv.className='olTileImage';this.frame.style.zIndex=this.isBackBuffer?0:1;this.frame.appendChild(this.imgDiv);this.layer.div.appendChild(this.frame);if(this.layer.opacity!=null){OpenLayers.Util.modifyDOMElement(this.imgDiv,null,null,null,null,null,null,this.layer.opacity);} +this.imgDiv.map=this.layer.map;var onload=function(){if(this.isLoading){this.isLoading=false;this.events.triggerEvent("loadend");}};if(this.layerAlphaHack){OpenLayers.Event.observe(this.imgDiv.childNodes[0],'load',OpenLayers.Function.bind(onload,this));}else{OpenLayers.Event.observe(this.imgDiv,'load',OpenLayers.Function.bind(onload,this));} +var onerror=function(){if(this.imgDiv._attempts>OpenLayers.IMAGE_RELOAD_ATTEMPTS){onload.call(this);}};OpenLayers.Event.observe(this.imgDiv,"error",OpenLayers.Function.bind(onerror,this));} +this.imgDiv.viewRequestID=this.layer.map.viewRequestID;},removeImgDiv:function(){OpenLayers.Event.stopObservingElement(this.imgDiv);if(this.imgDiv.parentNode==this.frame){this.frame.removeChild(this.imgDiv);this.imgDiv.map=null;} +this.imgDiv.urls=null;var child=this.imgDiv.firstChild;if(child){OpenLayers.Event.stopObservingElement(child);this.imgDiv.removeChild(child);delete child;}else{this.imgDiv.src=OpenLayers.Util.getImagesLocation()+"blank.gif";}},checkImgURL:function(){if(this.layer){var loaded=this.layerAlphaHack?this.imgDiv.firstChild.src:this.imgDiv.src;if(!OpenLayers.Util.isEquivalentUrl(loaded,this.url)){this.hide();}}},startTransition:function(){if(!this.backBufferTile||!this.backBufferTile.imgDiv){return;} +var ratio=1;if(this.backBufferTile.resolution){ratio=this.backBufferTile.resolution/this.layer.getResolution();} +if(ratio!=1){if(this.layer.transitionEffect=='resize'){var upperLeft=new OpenLayers.LonLat(this.backBufferTile.bounds.left,this.backBufferTile.bounds.top);var size=new OpenLayers.Size(this.backBufferTile.size.w*ratio,this.backBufferTile.size.h*ratio);var px=this.layer.map.getLayerPxFromLonLat(upperLeft);OpenLayers.Util.modifyDOMElement(this.backBufferTile.frame,null,px,size);var imageSize=this.backBufferTile.imageSize;imageSize=new OpenLayers.Size(imageSize.w*ratio,imageSize.h*ratio);var imageOffset=this.backBufferTile.imageOffset;if(imageOffset){imageOffset=new OpenLayers.Pixel(imageOffset.x*ratio,imageOffset.y*ratio);} +OpenLayers.Util.modifyDOMElement(this.backBufferTile.imgDiv,null,imageOffset,imageSize);this.backBufferTile.show();}}else{if(this.layer.singleTile){this.backBufferTile.show();}else{this.backBufferTile.hide();}}},show:function(){this.frame.style.display='';if(OpenLayers.Util.indexOf(this.layer.SUPPORTED_TRANSITIONS,this.layer.transitionEffect)!=-1){if(OpenLayers.IS_GECKO===true){this.frame.scrollLeft=this.frame.scrollLeft;}}},hide:function(){this.frame.style.display='none';},CLASS_NAME:"OpenLayers.Tile.Image"});OpenLayers.Tile.Image.useBlankTile=(OpenLayers.BROWSER_NAME=="safari"||OpenLayers.BROWSER_NAME=="opera");OpenLayers.ElementsIndexer=OpenLayers.Class({maxZIndex:null,order:null,indices:null,compare:null,initialize:function(yOrdering){this.compare=yOrdering?OpenLayers.ElementsIndexer.IndexingMethods.Z_ORDER_Y_ORDER:OpenLayers.ElementsIndexer.IndexingMethods.Z_ORDER_DRAWING_ORDER;this.clear();},insert:function(newNode){if(this.exists(newNode)){this.remove(newNode);} +var nodeId=newNode.id;this.determineZIndex(newNode);var leftIndex=-1;var rightIndex=this.order.length;var middle;while(rightIndex-leftIndex>1){middle=parseInt((leftIndex+rightIndex)/2);var placement=this.compare(this,newNode,OpenLayers.Util.getElement(this.order[middle]));if(placement>0){leftIndex=middle;}else{rightIndex=middle;}} +this.order.splice(rightIndex,0,nodeId);this.indices[nodeId]=this.getZIndex(newNode);return this.getNextElement(rightIndex);},remove:function(node){var nodeId=node.id;var arrayIndex=OpenLayers.Util.indexOf(this.order,nodeId);if(arrayIndex>=0){this.order.splice(arrayIndex,1);delete this.indices[nodeId];if(this.order.length>0){var lastId=this.order[this.order.length-1];this.maxZIndex=this.indices[lastId];}else{this.maxZIndex=0;}}},clear:function(){this.order=[];this.indices={};this.maxZIndex=0;},exists:function(node){return(this.indices[node.id]!=null);},getZIndex:function(node){return node._style.graphicZIndex;},determineZIndex:function(node){var zIndex=node._style.graphicZIndex;if(zIndex==null){zIndex=this.maxZIndex;node._style.graphicZIndex=zIndex;}else if(zIndex>this.maxZIndex){this.maxZIndex=zIndex;}},getNextElement:function(index){var nextIndex=index+1;if(nextIndex<this.order.length){var nextElement=OpenLayers.Util.getElement(this.order[nextIndex]);if(nextElement==undefined){nextElement=this.getNextElement(nextIndex);} +return nextElement;}else{return null;}},CLASS_NAME:"OpenLayers.ElementsIndexer"});OpenLayers.ElementsIndexer.IndexingMethods={Z_ORDER:function(indexer,newNode,nextNode){var newZIndex=indexer.getZIndex(newNode);var returnVal=0;if(nextNode){var nextZIndex=indexer.getZIndex(nextNode);returnVal=newZIndex-nextZIndex;} +return returnVal;},Z_ORDER_DRAWING_ORDER:function(indexer,newNode,nextNode){var returnVal=OpenLayers.ElementsIndexer.IndexingMethods.Z_ORDER(indexer,newNode,nextNode);if(nextNode&&returnVal==0){returnVal=1;} +return returnVal;},Z_ORDER_Y_ORDER:function(indexer,newNode,nextNode){var returnVal=OpenLayers.ElementsIndexer.IndexingMethods.Z_ORDER(indexer,newNode,nextNode);if(nextNode&&returnVal===0){var result=nextNode._boundsBottom-newNode._boundsBottom;returnVal=(result===0)?1:result;} +return returnVal;}};OpenLayers.Renderer.Elements=OpenLayers.Class(OpenLayers.Renderer,{rendererRoot:null,root:null,vectorRoot:null,textRoot:null,xmlns:null,indexer:null,BACKGROUND_ID_SUFFIX:"_background",LABEL_ID_SUFFIX:"_label",initialize:function(containerID,options){OpenLayers.Renderer.prototype.initialize.apply(this,arguments);this.rendererRoot=this.createRenderRoot();this.root=this.createRoot("_root");this.vectorRoot=this.createRoot("_vroot");this.textRoot=this.createRoot("_troot");this.root.appendChild(this.vectorRoot);this.root.appendChild(this.textRoot);this.rendererRoot.appendChild(this.root);this.container.appendChild(this.rendererRoot);if(options&&(options.zIndexing||options.yOrdering)){this.indexer=new OpenLayers.ElementsIndexer(options.yOrdering);}},destroy:function(){this.clear();this.rendererRoot=null;this.root=null;this.xmlns=null;OpenLayers.Renderer.prototype.destroy.apply(this,arguments);},clear:function(){var child;var root=this.vectorRoot;if(root){while(child=root.firstChild){root.removeChild(child);}} +root=this.textRoot;if(root){while(child=root.firstChild){root.removeChild(child);}} +if(this.indexer){this.indexer.clear();}},getNodeType:function(geometry,style){},drawGeometry:function(geometry,style,featureId){var className=geometry.CLASS_NAME;var rendered=true;if((className=="OpenLayers.Geometry.Collection")||(className=="OpenLayers.Geometry.MultiPoint")||(className=="OpenLayers.Geometry.MultiLineString")||(className=="OpenLayers.Geometry.MultiPolygon")){for(var i=0,len=geometry.components.length;i<len;i++){rendered=this.drawGeometry(geometry.components[i],style,featureId)&&rendered;} +return rendered;};rendered=false;var removeBackground=false;if(style.display!="none"){if(style.backgroundGraphic){this.redrawBackgroundNode(geometry.id,geometry,style,featureId);}else{removeBackground=true;} +rendered=this.redrawNode(geometry.id,geometry,style,featureId);} +if(rendered==false){var node=document.getElementById(geometry.id);if(node){if(node._style.backgroundGraphic){removeBackground=true;} +node.parentNode.removeChild(node);}} +if(removeBackground){var node=document.getElementById(geometry.id+this.BACKGROUND_ID_SUFFIX);if(node){node.parentNode.removeChild(node);}} +return rendered;},redrawNode:function(id,geometry,style,featureId){style=this.applyDefaultSymbolizer(style);var node=this.nodeFactory(id,this.getNodeType(geometry,style));node._featureId=featureId;node._boundsBottom=geometry.getBounds().bottom;node._geometryClass=geometry.CLASS_NAME;node._style=style;var drawResult=this.drawGeometryNode(node,geometry,style);if(drawResult===false){return false;} +node=drawResult.node;if(this.indexer){var insert=this.indexer.insert(node);if(insert){this.vectorRoot.insertBefore(node,insert);}else{this.vectorRoot.appendChild(node);}}else{if(node.parentNode!==this.vectorRoot){this.vectorRoot.appendChild(node);}} +this.postDraw(node);return drawResult.complete;},redrawBackgroundNode:function(id,geometry,style,featureId){var backgroundStyle=OpenLayers.Util.extend({},style);backgroundStyle.externalGraphic=backgroundStyle.backgroundGraphic;backgroundStyle.graphicXOffset=backgroundStyle.backgroundXOffset;backgroundStyle.graphicYOffset=backgroundStyle.backgroundYOffset;backgroundStyle.graphicZIndex=backgroundStyle.backgroundGraphicZIndex;backgroundStyle.graphicWidth=backgroundStyle.backgroundWidth||backgroundStyle.graphicWidth;backgroundStyle.graphicHeight=backgroundStyle.backgroundHeight||backgroundStyle.graphicHeight;backgroundStyle.backgroundGraphic=null;backgroundStyle.backgroundXOffset=null;backgroundStyle.backgroundYOffset=null;backgroundStyle.backgroundGraphicZIndex=null;return this.redrawNode(id+this.BACKGROUND_ID_SUFFIX,geometry,backgroundStyle,null);},drawGeometryNode:function(node,geometry,style){style=style||node._style;var options={'isFilled':style.fill===undefined?true:style.fill,'isStroked':style.stroke===undefined?!!style.strokeWidth:style.stroke};var drawn;switch(geometry.CLASS_NAME){case"OpenLayers.Geometry.Point":if(style.graphic===false){options.isFilled=false;options.isStroked=false;} +drawn=this.drawPoint(node,geometry);break;case"OpenLayers.Geometry.LineString":options.isFilled=false;drawn=this.drawLineString(node,geometry);break;case"OpenLayers.Geometry.LinearRing":drawn=this.drawLinearRing(node,geometry);break;case"OpenLayers.Geometry.Polygon":drawn=this.drawPolygon(node,geometry);break;case"OpenLayers.Geometry.Surface":drawn=this.drawSurface(node,geometry);break;case"OpenLayers.Geometry.Rectangle":drawn=this.drawRectangle(node,geometry);break;default:break;} +node._options=options;if(drawn!=false){return{node:this.setStyle(node,style,options,geometry),complete:drawn};}else{return false;}},postDraw:function(node){},drawPoint:function(node,geometry){},drawLineString:function(node,geometry){},drawLinearRing:function(node,geometry){},drawPolygon:function(node,geometry){},drawRectangle:function(node,geometry){},drawCircle:function(node,geometry){},drawSurface:function(node,geometry){},removeText:function(featureId){var label=document.getElementById(featureId+this.LABEL_ID_SUFFIX);if(label){this.textRoot.removeChild(label);}},getFeatureIdFromEvent:function(evt){var target=evt.target;var useElement=target&&target.correspondingUseElement;var node=useElement?useElement:(target||evt.srcElement);var featureId=node._featureId;return featureId;},eraseGeometry:function(geometry,featureId){if((geometry.CLASS_NAME=="OpenLayers.Geometry.MultiPoint")||(geometry.CLASS_NAME=="OpenLayers.Geometry.MultiLineString")||(geometry.CLASS_NAME=="OpenLayers.Geometry.MultiPolygon")||(geometry.CLASS_NAME=="OpenLayers.Geometry.Collection")){for(var i=0,len=geometry.components.length;i<len;i++){this.eraseGeometry(geometry.components[i],featureId);}}else{var element=OpenLayers.Util.getElement(geometry.id);if(element&&element.parentNode){if(element.geometry){element.geometry.destroy();element.geometry=null;} +element.parentNode.removeChild(element);if(this.indexer){this.indexer.remove(element);} +if(element._style.backgroundGraphic){var backgroundId=geometry.id+this.BACKGROUND_ID_SUFFIX;var bElem=OpenLayers.Util.getElement(backgroundId);if(bElem&&bElem.parentNode){bElem.parentNode.removeChild(bElem);}}}}},nodeFactory:function(id,type){var node=OpenLayers.Util.getElement(id);if(node){if(!this.nodeTypeCompare(node,type)){node.parentNode.removeChild(node);node=this.nodeFactory(id,type);}}else{node=this.createNode(type,id);} +return node;},nodeTypeCompare:function(node,type){},createNode:function(type,id){},moveRoot:function(renderer){var root=this.root;if(renderer.root.parentNode==this.rendererRoot){root=renderer.root;} +root.parentNode.removeChild(root);renderer.rendererRoot.appendChild(root);},getRenderLayerId:function(){return this.root.parentNode.parentNode.id;},isComplexSymbol:function(graphicName){return(graphicName!="circle")&&!!graphicName;},CLASS_NAME:"OpenLayers.Renderer.Elements"});OpenLayers.Renderer.symbol={"star":[350,75,379,161,469,161,397,215,423,301,350,250,277,301,303,215,231,161,321,161,350,75],"cross":[4,0,6,0,6,4,10,4,10,6,6,6,6,10,4,10,4,6,0,6,0,4,4,4,4,0],"x":[0,0,25,0,50,35,75,0,100,0,65,50,100,100,75,100,50,65,25,100,0,100,35,50,0,0],"square":[0,0,0,1,1,1,1,0,0,0],"triangle":[0,10,10,10,5,0,0,10]};OpenLayers.Control.ArgParser=OpenLayers.Class(OpenLayers.Control,{center:null,zoom:null,layers:null,displayProjection:null,getParameters:function(url){url=url||window.location.href;var parameters=OpenLayers.Util.getParameters(url);var index=url.indexOf('#');if(index>0){url='?'+url.substring(index+1,url.length);OpenLayers.Util.extend(parameters,OpenLayers.Util.getParameters(url));} +return parameters;},setMap:function(map){OpenLayers.Control.prototype.setMap.apply(this,arguments);for(var i=0,len=this.map.controls.length;i<len;i++){var control=this.map.controls[i];if((control!=this)&&(control.CLASS_NAME=="OpenLayers.Control.ArgParser")){if(control.displayProjection!=this.displayProjection){this.displayProjection=control.displayProjection;} +break;}} +if(i==this.map.controls.length){var args=this.getParameters();if(args.layers){this.layers=args.layers;this.map.events.register('addlayer',this,this.configureLayers);this.configureLayers();} +if(args.lat&&args.lon){this.center=new OpenLayers.LonLat(parseFloat(args.lon),parseFloat(args.lat));if(args.zoom){this.zoom=parseInt(args.zoom);} +this.map.events.register('changebaselayer',this,this.setCenter);this.setCenter();}}},setCenter:function(){if(this.map.baseLayer){this.map.events.unregister('changebaselayer',this,this.setCenter);if(this.displayProjection){this.center.transform(this.displayProjection,this.map.getProjectionObject());} +this.map.setCenter(this.center,this.zoom);}},configureLayers:function(){if(this.layers.length==this.map.layers.length){this.map.events.unregister('addlayer',this,this.configureLayers);for(var i=0,len=this.layers.length;i<len;i++){var layer=this.map.layers[i];var c=this.layers.charAt(i);if(c=="B"){this.map.setBaseLayer(layer);}else if((c=="T")||(c=="F")){layer.setVisibility(c=="T");}}}},CLASS_NAME:"OpenLayers.Control.ArgParser"});OpenLayers.Control.Permalink=OpenLayers.Class(OpenLayers.Control,{argParserClass:OpenLayers.Control.ArgParser,element:null,anchor:false,base:'',displayProjection:null,initialize:function(element,base,options){if(element!==null&&typeof element=='object'&&!OpenLayers.Util.isElement(element)){options=element;this.base=document.location.href;OpenLayers.Control.prototype.initialize.apply(this,[options]);if(this.element!=null){this.element=OpenLayers.Util.getElement(this.element);}} +else{OpenLayers.Control.prototype.initialize.apply(this,[options]);this.element=OpenLayers.Util.getElement(element);this.base=base||document.location.href;}},destroy:function(){if(this.element.parentNode==this.div){this.div.removeChild(this.element);} +this.element=null;this.map.events.unregister('moveend',this,this.updateLink);OpenLayers.Control.prototype.destroy.apply(this,arguments);},setMap:function(map){OpenLayers.Control.prototype.setMap.apply(this,arguments);for(var i=0,len=this.map.controls.length;i<len;i++){var control=this.map.controls[i];if(control.CLASS_NAME==this.argParserClass.CLASS_NAME){if(control.displayProjection!=this.displayProjection){this.displayProjection=control.displayProjection;} +break;}} +if(i==this.map.controls.length){this.map.addControl(new this.argParserClass({'displayProjection':this.displayProjection}));}},draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);if(!this.element&&!this.anchor){this.element=document.createElement("a");this.element.innerHTML=OpenLayers.i18n("Permalink");this.element.href="";this.div.appendChild(this.element);} +this.map.events.on({'moveend':this.updateLink,'changelayer':this.updateLink,'changebaselayer':this.updateLink,scope:this});this.updateLink();return this.div;},updateLink:function(){var separator=this.anchor?'#':'?';var href=this.base;if(href.indexOf(separator)!=-1){href=href.substring(0,href.indexOf(separator));} +href+=separator+OpenLayers.Util.getParameterString(this.createParams());if(this.anchor&&!this.element){window.location.href=href;} +else{this.element.href=href;}},createParams:function(center,zoom,layers){center=center||this.map.getCenter();var params=OpenLayers.Util.getParameters(this.base);if(center){params.zoom=zoom||this.map.getZoom();var lat=center.lat;var lon=center.lon;if(this.displayProjection){var mapPosition=OpenLayers.Projection.transform({x:lon,y:lat},this.map.getProjectionObject(),this.displayProjection);lon=mapPosition.x;lat=mapPosition.y;} +params.lat=Math.round(lat*100000)/100000;params.lon=Math.round(lon*100000)/100000;layers=layers||this.map.layers;params.layers='';for(var i=0,len=layers.length;i<len;i++){var layer=layers[i];if(layer.isBaseLayer){params.layers+=(layer==this.map.baseLayer)?"B":"0";}else{params.layers+=(layer.getVisibility())?"T":"F";}}} +return params;},CLASS_NAME:"OpenLayers.Control.Permalink"});OpenLayers.Strategy=OpenLayers.Class({layer:null,options:null,active:null,autoActivate:true,autoDestroy:true,initialize:function(options){OpenLayers.Util.extend(this,options);this.options=options;this.active=false;},destroy:function(){this.deactivate();this.layer=null;this.options=null;},setLayer:function(layer){this.layer=layer;},activate:function(){if(!this.active){this.active=true;return true;} +return false;},deactivate:function(){if(this.active){this.active=false;return true;} +return false;},CLASS_NAME:"OpenLayers.Strategy"});OpenLayers.Strategy.Fixed=OpenLayers.Class(OpenLayers.Strategy,{preload:false,activate:function(){if(OpenLayers.Strategy.prototype.activate.apply(this,arguments)){this.layer.events.on({"refresh":this.load,scope:this});if(this.layer.visibility==true||this.preload){this.load();}else{this.layer.events.on({"visibilitychanged":this.load,scope:this});} +return true;} +return false;},deactivate:function(){var deactivated=OpenLayers.Strategy.prototype.deactivate.call(this);if(deactivated){this.layer.events.un({"refresh":this.load,"visibilitychanged":this.load,scope:this});} +return deactivated;},load:function(options){var layer=this.layer;layer.events.triggerEvent("loadstart");layer.protocol.read(OpenLayers.Util.applyDefaults({callback:OpenLayers.Function.bind(this.merge,this,layer.map.getProjectionObject()),filter:layer.filter},options));layer.events.un({"visibilitychanged":this.load,scope:this});},merge:function(mapProjection,resp){var layer=this.layer;layer.destroyFeatures();var features=resp.features;if(features&&features.length>0){if(!mapProjection.equals(layer.projection)){var geom;for(var i=0,len=features.length;i<len;++i){geom=features[i].geometry;if(geom){geom.transform(layer.projection,mapProjection);}}} +layer.addFeatures(features);} +layer.events.triggerEvent("loadend");},CLASS_NAME:"OpenLayers.Strategy.Fixed"});OpenLayers.Date={toISOString:(function(){if("toISOString"in Date.prototype){return function(date){return date.toISOString();};}else{function pad(num,len){var str=num+"";while(str.length<len){str="0"+str;} +return str;} +return function(date){var str;if(isNaN(date.getTime())){str="Invalid Date";}else{str=date.getUTCFullYear()+"-"+ +pad(date.getUTCMonth()+1,2)+"-"+ +pad(date.getUTCDate(),2)+"T"+ +pad(date.getUTCHours(),2)+":"+ +pad(date.getUTCMinutes(),2)+":"+ +pad(date.getUTCSeconds(),2)+"."+ +pad(date.getUTCMilliseconds(),3)+"Z";} +return str;};}})(),parse:function(str){var date;var match=str.match(/^(?:(\d{4})(?:-(\d{2})(?:-(\d{2}))?)?)?(?:T(\d{1,2}):(\d{2}):(\d{2}(?:\.\d+)?)(Z|(?:[+-]\d{1,2}(?::(\d{2}))?)))?$/);if(match&&(match[1]||match[7])){var year=parseInt(match[1],10)||0;var month=(parseInt(match[2],10)-1)||0;var day=parseInt(match[3],10)||1;date=new Date(Date.UTC(year,month,day));var type=match[7];if(type){var hours=parseInt(match[4],10);var minutes=parseInt(match[5],10);var secFrac=parseFloat(match[6]);var seconds=secFrac|0;var milliseconds=Math.round(1000*(secFrac-seconds));date.setUTCHours(hours,minutes,seconds,milliseconds);if(type!=="Z"){var hoursOffset=parseInt(type,10);var minutesOffset=parseInt(match[8],10)||0;var offset=-1000*(60*(hoursOffset*60)+minutesOffset*60);date=new Date(date.getTime()+offset);}}}else{date=new Date("invalid");} +return date;}};OpenLayers.Format.XML=OpenLayers.Class(OpenLayers.Format,{namespaces:null,namespaceAlias:null,defaultPrefix:null,readers:{},writers:{},xmldom:null,initialize:function(options){if(window.ActiveXObject){this.xmldom=new ActiveXObject("Microsoft.XMLDOM");} +OpenLayers.Format.prototype.initialize.apply(this,[options]);this.namespaces=OpenLayers.Util.extend({},this.namespaces);this.namespaceAlias={};for(var alias in this.namespaces){this.namespaceAlias[this.namespaces[alias]]=alias;}},destroy:function(){this.xmldom=null;OpenLayers.Format.prototype.destroy.apply(this,arguments);},setNamespace:function(alias,uri){this.namespaces[alias]=uri;this.namespaceAlias[uri]=alias;},read:function(text){var index=text.indexOf('<');if(index>0){text=text.substring(index);} +var node=OpenLayers.Util.Try(OpenLayers.Function.bind((function(){var xmldom;if(window.ActiveXObject&&!this.xmldom){xmldom=new ActiveXObject("Microsoft.XMLDOM");}else{xmldom=this.xmldom;} +xmldom.loadXML(text);return xmldom;}),this),function(){return new DOMParser().parseFromString(text,'text/xml');},function(){var req=new XMLHttpRequest();req.open("GET","data:"+"text/xml"+";charset=utf-8,"+encodeURIComponent(text),false);if(req.overrideMimeType){req.overrideMimeType("text/xml");} +req.send(null);return req.responseXML;});if(this.keepData){this.data=node;} +return node;},write:function(node){var data;if(this.xmldom){data=node.xml;}else{var serializer=new XMLSerializer();if(node.nodeType==1){var doc=document.implementation.createDocument("","",null);if(doc.importNode){node=doc.importNode(node,true);} +doc.appendChild(node);data=serializer.serializeToString(doc);}else{data=serializer.serializeToString(node);}} +return data;},createElementNS:function(uri,name){var element;if(this.xmldom){if(typeof uri=="string"){element=this.xmldom.createNode(1,name,uri);}else{element=this.xmldom.createNode(1,name,"");}}else{element=document.createElementNS(uri,name);} +return element;},createTextNode:function(text){var node;if(typeof text!=="string"){text=String(text);} +if(this.xmldom){node=this.xmldom.createTextNode(text);}else{node=document.createTextNode(text);} +return node;},getElementsByTagNameNS:function(node,uri,name){var elements=[];if(node.getElementsByTagNameNS){elements=node.getElementsByTagNameNS(uri,name);}else{var allNodes=node.getElementsByTagName("*");var potentialNode,fullName;for(var i=0,len=allNodes.length;i<len;++i){potentialNode=allNodes[i];fullName=(potentialNode.prefix)?(potentialNode.prefix+":"+name):name;if((name=="*")||(fullName==potentialNode.nodeName)){if((uri=="*")||(uri==potentialNode.namespaceURI)){elements.push(potentialNode);}}}} +return elements;},getAttributeNodeNS:function(node,uri,name){var attributeNode=null;if(node.getAttributeNodeNS){attributeNode=node.getAttributeNodeNS(uri,name);}else{var attributes=node.attributes;var potentialNode,fullName;for(var i=0,len=attributes.length;i<len;++i){potentialNode=attributes[i];if(potentialNode.namespaceURI==uri){fullName=(potentialNode.prefix)?(potentialNode.prefix+":"+name):name;if(fullName==potentialNode.nodeName){attributeNode=potentialNode;break;}}}} +return attributeNode;},getAttributeNS:function(node,uri,name){var attributeValue="";if(node.getAttributeNS){attributeValue=node.getAttributeNS(uri,name)||"";}else{var attributeNode=this.getAttributeNodeNS(node,uri,name);if(attributeNode){attributeValue=attributeNode.nodeValue;}} +return attributeValue;},getChildValue:function(node,def){var value=def||"";if(node){for(var child=node.firstChild;child;child=child.nextSibling){switch(child.nodeType){case 3:case 4:value+=child.nodeValue;}}} +return value;},concatChildValues:function(node,def){var value="";var child=node.firstChild;var childValue;while(child){childValue=child.nodeValue;if(childValue){value+=childValue;} +child=child.nextSibling;} +if(value==""&&def!=undefined){value=def;} +return value;},isSimpleContent:function(node){var simple=true;for(var child=node.firstChild;child;child=child.nextSibling){if(child.nodeType===1){simple=false;break;}} +return simple;},contentType:function(node){var simple=false,complex=false;var type=OpenLayers.Format.XML.CONTENT_TYPE.EMPTY;for(var child=node.firstChild;child;child=child.nextSibling){switch(child.nodeType){case 1:complex=true;break;case 8:break;default:simple=true;} +if(complex&&simple){break;}} +if(complex&&simple){type=OpenLayers.Format.XML.CONTENT_TYPE.MIXED;}else if(complex){return OpenLayers.Format.XML.CONTENT_TYPE.COMPLEX;}else if(simple){return OpenLayers.Format.XML.CONTENT_TYPE.SIMPLE;} +return type;},hasAttributeNS:function(node,uri,name){var found=false;if(node.hasAttributeNS){found=node.hasAttributeNS(uri,name);}else{found=!!this.getAttributeNodeNS(node,uri,name);} +return found;},setAttributeNS:function(node,uri,name,value){if(node.setAttributeNS){node.setAttributeNS(uri,name,value);}else{if(this.xmldom){if(uri){var attribute=node.ownerDocument.createNode(2,name,uri);attribute.nodeValue=value;node.setAttributeNode(attribute);}else{node.setAttribute(name,value);}}else{throw"setAttributeNS not implemented";}}},createElementNSPlus:function(name,options){options=options||{};var uri=options.uri||this.namespaces[options.prefix];if(!uri){var loc=name.indexOf(":");uri=this.namespaces[name.substring(0,loc)];} +if(!uri){uri=this.namespaces[this.defaultPrefix];} +var node=this.createElementNS(uri,name);if(options.attributes){this.setAttributes(node,options.attributes);} +var value=options.value;if(value!=null){node.appendChild(this.createTextNode(value));} +return node;},setAttributes:function(node,obj){var value,uri;for(var name in obj){if(obj[name]!=null&&obj[name].toString){value=obj[name].toString();uri=this.namespaces[name.substring(0,name.indexOf(":"))]||null;this.setAttributeNS(node,uri,name,value);}}},readNode:function(node,obj){if(!obj){obj={};} +var group=this.readers[node.namespaceURI?this.namespaceAlias[node.namespaceURI]:this.defaultPrefix];if(group){var local=node.localName||node.nodeName.split(":").pop();var reader=group[local]||group["*"];if(reader){reader.apply(this,[node,obj]);}} +return obj;},readChildNodes:function(node,obj){if(!obj){obj={};} +var children=node.childNodes;var child;for(var i=0,len=children.length;i<len;++i){child=children[i];if(child.nodeType==1){this.readNode(child,obj);}} +return obj;},writeNode:function(name,obj,parent){var prefix,local;var split=name.indexOf(":");if(split>0){prefix=name.substring(0,split);local=name.substring(split+1);}else{if(parent){prefix=this.namespaceAlias[parent.namespaceURI];}else{prefix=this.defaultPrefix;} +local=name;} +var child=this.writers[prefix][local].apply(this,[obj]);if(parent){parent.appendChild(child);} +return child;},getChildEl:function(node,name,uri){return node&&this.getThisOrNextEl(node.firstChild,name,uri);},getNextEl:function(node,name,uri){return node&&this.getThisOrNextEl(node.nextSibling,name,uri);},getThisOrNextEl:function(node,name,uri){outer:for(var sibling=node;sibling;sibling=sibling.nextSibling){switch(sibling.nodeType){case 1:if((!name||name===(sibling.localName||sibling.nodeName.split(":").pop()))&&(!uri||uri===sibling.namespaceURI)){break outer;} +sibling=null;break outer;case 3:if(/^\s*$/.test(sibling.nodeValue)){break;} +case 4:case 6:case 12:case 10:case 11:sibling=null;break outer;}} +return sibling||null;},lookupNamespaceURI:function(node,prefix){var uri=null;if(node){if(node.lookupNamespaceURI){uri=node.lookupNamespaceURI(prefix);}else{outer:switch(node.nodeType){case 1:if(node.namespaceURI!==null&&node.prefix===prefix){uri=node.namespaceURI;break outer;} +var len=node.attributes.length;if(len){var attr;for(var i=0;i<len;++i){attr=node.attributes[i];if(attr.prefix==="xmlns"&&attr.name==="xmlns:"+prefix){uri=attr.value||null;break outer;}else if(attr.name==="xmlns"&&prefix===null){uri=attr.value||null;break outer;}}} +uri=this.lookupNamespaceURI(node.parentNode,prefix);break outer;case 2:uri=this.lookupNamespaceURI(node.ownerElement,prefix);break outer;case 9:uri=this.lookupNamespaceURI(node.documentElement,prefix);break outer;case 6:case 12:case 10:case 11:break outer;default:uri=this.lookupNamespaceURI(node.parentNode,prefix);break outer;}}} +return uri;},getXMLDoc:function(){if(!OpenLayers.Format.XML.document&&!this.xmldom){if(document.implementation&&document.implementation.createDocument){OpenLayers.Format.XML.document=document.implementation.createDocument("","",null);}else if(!this.xmldom&&window.ActiveXObject){this.xmldom=new ActiveXObject("Microsoft.XMLDOM");}} +return OpenLayers.Format.XML.document||this.xmldom;},CLASS_NAME:"OpenLayers.Format.XML"});OpenLayers.Format.XML.CONTENT_TYPE={EMPTY:0,SIMPLE:1,COMPLEX:2,MIXED:3};OpenLayers.Format.XML.lookupNamespaceURI=OpenLayers.Function.bind(OpenLayers.Format.XML.prototype.lookupNamespaceURI,OpenLayers.Format.XML.prototype);OpenLayers.Format.XML.document=null;OpenLayers.Geometry.Polygon=OpenLayers.Class(OpenLayers.Geometry.Collection,{componentTypes:["OpenLayers.Geometry.LinearRing"],initialize:function(components){OpenLayers.Geometry.Collection.prototype.initialize.apply(this,arguments);},getArea:function(){var area=0.0;if(this.components&&(this.components.length>0)){area+=Math.abs(this.components[0].getArea());for(var i=1,len=this.components.length;i<len;i++){area-=Math.abs(this.components[i].getArea());}} +return area;},getGeodesicArea:function(projection){var area=0.0;if(this.components&&(this.components.length>0)){area+=Math.abs(this.components[0].getGeodesicArea(projection));for(var i=1,len=this.components.length;i<len;i++){area-=Math.abs(this.components[i].getGeodesicArea(projection));}} +return area;},containsPoint:function(point){var numRings=this.components.length;var contained=false;if(numRings>0){contained=this.components[0].containsPoint(point);if(contained!==1){if(contained&&numRings>1){var hole;for(var i=1;i<numRings;++i){hole=this.components[i].containsPoint(point);if(hole){if(hole===1){contained=1;}else{contained=false;} +break;}}}}} +return contained;},intersects:function(geometry){var intersect=false;var i,len;if(geometry.CLASS_NAME=="OpenLayers.Geometry.Point"){intersect=this.containsPoint(geometry);}else if(geometry.CLASS_NAME=="OpenLayers.Geometry.LineString"||geometry.CLASS_NAME=="OpenLayers.Geometry.LinearRing"){for(i=0,len=this.components.length;i<len;++i){intersect=geometry.intersects(this.components[i]);if(intersect){break;}} +if(!intersect){for(i=0,len=geometry.components.length;i<len;++i){intersect=this.containsPoint(geometry.components[i]);if(intersect){break;}}}}else{for(i=0,len=geometry.components.length;i<len;++i){intersect=this.intersects(geometry.components[i]);if(intersect){break;}}} +if(!intersect&&geometry.CLASS_NAME=="OpenLayers.Geometry.Polygon"){var ring=this.components[0];for(i=0,len=ring.components.length;i<len;++i){intersect=geometry.containsPoint(ring.components[i]);if(intersect){break;}}} +return intersect;},distanceTo:function(geometry,options){var edge=!(options&&options.edge===false);var result;if(!edge&&this.intersects(geometry)){result=0;}else{result=OpenLayers.Geometry.Collection.prototype.distanceTo.apply(this,[geometry,options]);} +return result;},CLASS_NAME:"OpenLayers.Geometry.Polygon"});OpenLayers.Geometry.Polygon.createRegularPolygon=function(origin,radius,sides,rotation){var angle=Math.PI*((1/sides)-(1/2));if(rotation){angle+=(rotation/180)*Math.PI;} +var rotatedAngle,x,y;var points=[];for(var i=0;i<sides;++i){rotatedAngle=angle+(i*2*Math.PI/sides);x=origin.x+(radius*Math.cos(rotatedAngle));y=origin.y+(radius*Math.sin(rotatedAngle));points.push(new OpenLayers.Geometry.Point(x,y));} +var ring=new OpenLayers.Geometry.LinearRing(points);return new OpenLayers.Geometry.Polygon([ring]);};OpenLayers.Request={DEFAULT_CONFIG:{method:"GET",url:window.location.href,async:true,user:undefined,password:undefined,params:null,proxy:OpenLayers.ProxyHost,headers:{},data:null,callback:function(){},success:null,failure:null,scope:null},URL_SPLIT_REGEX:/([^:]*:)\/\/([^:]*:?[^@]*@)?([^:\/\?]*):?([^\/\?]*)/,events:new OpenLayers.Events(this,null,["complete","success","failure"]),issue:function(config){var defaultConfig=OpenLayers.Util.extend(this.DEFAULT_CONFIG,{proxy:OpenLayers.ProxyHost});config=OpenLayers.Util.applyDefaults(config,defaultConfig);var request=new OpenLayers.Request.XMLHttpRequest();var url=OpenLayers.Util.urlAppend(config.url,OpenLayers.Util.getParameterString(config.params||{}));var sameOrigin=!(url.indexOf("http")==0);var urlParts=!sameOrigin&&url.match(this.URL_SPLIT_REGEX);if(urlParts){var location=window.location;sameOrigin=urlParts[1]==location.protocol&&urlParts[3]==location.hostname;var uPort=urlParts[4],lPort=location.port;if(uPort!=80&&uPort!=""||lPort!="80"&&lPort!=""){sameOrigin=sameOrigin&&uPort==lPort;}} +if(!sameOrigin){if(config.proxy){if(typeof config.proxy=="function"){url=config.proxy(url);}else{url=config.proxy+encodeURIComponent(url);}}else{OpenLayers.Console.warn(OpenLayers.i18n("proxyNeeded"),{url:url});}} +request.open(config.method,url,config.async,config.user,config.password);for(var header in config.headers){request.setRequestHeader(header,config.headers[header]);} +var events=this.events;var self=this;request.onreadystatechange=function(){if(request.readyState==OpenLayers.Request.XMLHttpRequest.DONE){var proceed=events.triggerEvent("complete",{request:request,config:config,requestUrl:url});if(proceed!==false){self.runCallbacks({request:request,config:config,requestUrl:url});}}};if(config.async===false){request.send(config.data);}else{window.setTimeout(function(){if(request.readyState!==0){request.send(config.data);}},0);} +return request;},runCallbacks:function(options){var request=options.request;var config=options.config;var complete=(config.scope)?OpenLayers.Function.bind(config.callback,config.scope):config.callback;var success;if(config.success){success=(config.scope)?OpenLayers.Function.bind(config.success,config.scope):config.success;} +var failure;if(config.failure){failure=(config.scope)?OpenLayers.Function.bind(config.failure,config.scope):config.failure;} +if(OpenLayers.Util.createUrlObject(config.url).protocol=="file:"&&request.responseText){request.status=200;} +complete(request);if(!request.status||(request.status>=200&&request.status<300)){this.events.triggerEvent("success",options);if(success){success(request);}} +if(request.status&&(request.status<200||request.status>=300)){this.events.triggerEvent("failure",options);if(failure){failure(request);}}},GET:function(config){config=OpenLayers.Util.extend(config,{method:"GET"});return OpenLayers.Request.issue(config);},POST:function(config){config=OpenLayers.Util.extend(config,{method:"POST"});config.headers=config.headers?config.headers:{};if(!("CONTENT-TYPE"in OpenLayers.Util.upperCaseObject(config.headers))){config.headers["Content-Type"]="application/xml";} +return OpenLayers.Request.issue(config);},PUT:function(config){config=OpenLayers.Util.extend(config,{method:"PUT"});config.headers=config.headers?config.headers:{};if(!("CONTENT-TYPE"in OpenLayers.Util.upperCaseObject(config.headers))){config.headers["Content-Type"]="application/xml";} +return OpenLayers.Request.issue(config);},DELETE:function(config){config=OpenLayers.Util.extend(config,{method:"DELETE"});return OpenLayers.Request.issue(config);},HEAD:function(config){config=OpenLayers.Util.extend(config,{method:"HEAD"});return OpenLayers.Request.issue(config);},OPTIONS:function(config){config=OpenLayers.Util.extend(config,{method:"OPTIONS"});return OpenLayers.Request.issue(config);}};(function(){var oXMLHttpRequest=window.XMLHttpRequest;var bGecko=!!window.controllers,bIE=window.document.all&&!window.opera,bIE7=bIE&&window.navigator.userAgent.match(/MSIE 7.0/);function fXMLHttpRequest(){this._object=oXMLHttpRequest&&!bIE7?new oXMLHttpRequest:new window.ActiveXObject("Microsoft.XMLHTTP");this._listeners=[];};function cXMLHttpRequest(){return new fXMLHttpRequest;};cXMLHttpRequest.prototype=fXMLHttpRequest.prototype;if(bGecko&&oXMLHttpRequest.wrapped) +cXMLHttpRequest.wrapped=oXMLHttpRequest.wrapped;cXMLHttpRequest.UNSENT=0;cXMLHttpRequest.OPENED=1;cXMLHttpRequest.HEADERS_RECEIVED=2;cXMLHttpRequest.LOADING=3;cXMLHttpRequest.DONE=4;cXMLHttpRequest.prototype.readyState=cXMLHttpRequest.UNSENT;cXMLHttpRequest.prototype.responseText='';cXMLHttpRequest.prototype.responseXML=null;cXMLHttpRequest.prototype.status=0;cXMLHttpRequest.prototype.statusText='';cXMLHttpRequest.prototype.priority="NORMAL";cXMLHttpRequest.prototype.onreadystatechange=null;cXMLHttpRequest.onreadystatechange=null;cXMLHttpRequest.onopen=null;cXMLHttpRequest.onsend=null;cXMLHttpRequest.onabort=null;cXMLHttpRequest.prototype.open=function(sMethod,sUrl,bAsync,sUser,sPassword){delete this._headers;if(arguments.length<3) +bAsync=true;this._async=bAsync;var oRequest=this,nState=this.readyState,fOnUnload;if(bIE&&bAsync){fOnUnload=function(){if(nState!=cXMLHttpRequest.DONE){fCleanTransport(oRequest);oRequest.abort();}};window.attachEvent("onunload",fOnUnload);} +if(cXMLHttpRequest.onopen) +cXMLHttpRequest.onopen.apply(this,arguments);if(arguments.length>4) +this._object.open(sMethod,sUrl,bAsync,sUser,sPassword);else +if(arguments.length>3) +this._object.open(sMethod,sUrl,bAsync,sUser);else +this._object.open(sMethod,sUrl,bAsync);this.readyState=cXMLHttpRequest.OPENED;fReadyStateChange(this);this._object.onreadystatechange=function(){if(bGecko&&!bAsync) +return;oRequest.readyState=oRequest._object.readyState;fSynchronizeValues(oRequest);if(oRequest._aborted){oRequest.readyState=cXMLHttpRequest.UNSENT;return;} +if(oRequest.readyState==cXMLHttpRequest.DONE){delete oRequest._data;fCleanTransport(oRequest);if(bIE&&bAsync) +window.detachEvent("onunload",fOnUnload);} +if(nState!=oRequest.readyState) +fReadyStateChange(oRequest);nState=oRequest.readyState;}};function fXMLHttpRequest_send(oRequest){oRequest._object.send(oRequest._data);if(bGecko&&!oRequest._async){oRequest.readyState=cXMLHttpRequest.OPENED;fSynchronizeValues(oRequest);while(oRequest.readyState<cXMLHttpRequest.DONE){oRequest.readyState++;fReadyStateChange(oRequest);if(oRequest._aborted) +return;}}};cXMLHttpRequest.prototype.send=function(vData){if(cXMLHttpRequest.onsend) +cXMLHttpRequest.onsend.apply(this,arguments);if(!arguments.length) +vData=null;if(vData&&vData.nodeType){vData=window.XMLSerializer?new window.XMLSerializer().serializeToString(vData):vData.xml;if(!oRequest._headers["Content-Type"]) +oRequest._object.setRequestHeader("Content-Type","application/xml");} +this._data=vData;fXMLHttpRequest_send(this);};cXMLHttpRequest.prototype.abort=function(){if(cXMLHttpRequest.onabort) +cXMLHttpRequest.onabort.apply(this,arguments);if(this.readyState>cXMLHttpRequest.UNSENT) +this._aborted=true;this._object.abort();fCleanTransport(this);this.readyState=cXMLHttpRequest.UNSENT;delete this._data;};cXMLHttpRequest.prototype.getAllResponseHeaders=function(){return this._object.getAllResponseHeaders();};cXMLHttpRequest.prototype.getResponseHeader=function(sName){return this._object.getResponseHeader(sName);};cXMLHttpRequest.prototype.setRequestHeader=function(sName,sValue){if(!this._headers) +this._headers={};this._headers[sName]=sValue;return this._object.setRequestHeader(sName,sValue);};cXMLHttpRequest.prototype.addEventListener=function(sName,fHandler,bUseCapture){for(var nIndex=0,oListener;oListener=this._listeners[nIndex];nIndex++) +if(oListener[0]==sName&&oListener[1]==fHandler&&oListener[2]==bUseCapture) +return;this._listeners.push([sName,fHandler,bUseCapture]);};cXMLHttpRequest.prototype.removeEventListener=function(sName,fHandler,bUseCapture){for(var nIndex=0,oListener;oListener=this._listeners[nIndex];nIndex++) +if(oListener[0]==sName&&oListener[1]==fHandler&&oListener[2]==bUseCapture) +break;if(oListener) +this._listeners.splice(nIndex,1);};cXMLHttpRequest.prototype.dispatchEvent=function(oEvent){var oEventPseudo={'type':oEvent.type,'target':this,'currentTarget':this,'eventPhase':2,'bubbles':oEvent.bubbles,'cancelable':oEvent.cancelable,'timeStamp':oEvent.timeStamp,'stopPropagation':function(){},'preventDefault':function(){},'initEvent':function(){}};if(oEventPseudo.type=="readystatechange"&&this.onreadystatechange) +(this.onreadystatechange.handleEvent||this.onreadystatechange).apply(this,[oEventPseudo]);for(var nIndex=0,oListener;oListener=this._listeners[nIndex];nIndex++) +if(oListener[0]==oEventPseudo.type&&!oListener[2]) +(oListener[1].handleEvent||oListener[1]).apply(this,[oEventPseudo]);};cXMLHttpRequest.prototype.toString=function(){return'['+"object"+' '+"XMLHttpRequest"+']';};cXMLHttpRequest.toString=function(){return'['+"XMLHttpRequest"+']';};function fReadyStateChange(oRequest){if(cXMLHttpRequest.onreadystatechange) +cXMLHttpRequest.onreadystatechange.apply(oRequest);oRequest.dispatchEvent({'type':"readystatechange",'bubbles':false,'cancelable':false,'timeStamp':new Date+0});};function fGetDocument(oRequest){var oDocument=oRequest.responseXML,sResponse=oRequest.responseText;if(bIE&&sResponse&&oDocument&&!oDocument.documentElement&&oRequest.getResponseHeader("Content-Type").match(/[^\/]+\/[^\+]+\+xml/)){oDocument=new window.ActiveXObject("Microsoft.XMLDOM");oDocument.async=false;oDocument.validateOnParse=false;oDocument.loadXML(sResponse);} +if(oDocument) +if((bIE&&oDocument.parseError!=0)||!oDocument.documentElement||(oDocument.documentElement&&oDocument.documentElement.tagName=="parsererror")) +return null;return oDocument;};function fSynchronizeValues(oRequest){try{oRequest.responseText=oRequest._object.responseText;}catch(e){} +try{oRequest.responseXML=fGetDocument(oRequest._object);}catch(e){} +try{oRequest.status=oRequest._object.status;}catch(e){} +try{oRequest.statusText=oRequest._object.statusText;}catch(e){}};function fCleanTransport(oRequest){oRequest._object.onreadystatechange=new window.Function;};if(!window.Function.prototype.apply){window.Function.prototype.apply=function(oRequest,oArguments){if(!oArguments) +oArguments=[];oRequest.__func=this;oRequest.__func(oArguments[0],oArguments[1],oArguments[2],oArguments[3],oArguments[4]);delete oRequest.__func;};};OpenLayers.Request.XMLHttpRequest=cXMLHttpRequest;})();OpenLayers.Projection=OpenLayers.Class({proj:null,projCode:null,titleRegEx:/\+title=[^\+]*/,initialize:function(projCode,options){OpenLayers.Util.extend(this,options);this.projCode=projCode;if(window.Proj4js){this.proj=new Proj4js.Proj(projCode);}},getCode:function(){return this.proj?this.proj.srsCode:this.projCode;},getUnits:function(){return this.proj?this.proj.units:null;},toString:function(){return this.getCode();},equals:function(projection){var p=projection,equals=false;if(p){if(window.Proj4js&&this.proj.defData&&p.proj.defData){equals=this.proj.defData.replace(this.titleRegEx,"")==p.proj.defData.replace(this.titleRegEx,"");}else if(p.getCode){var source=this.getCode(),target=p.getCode();equals=source==target||!!OpenLayers.Projection.transforms[source]&&OpenLayers.Projection.transforms[source][target]===OpenLayers.Projection.nullTransform;}} +return equals;},destroy:function(){delete this.proj;delete this.projCode;},CLASS_NAME:"OpenLayers.Projection"});OpenLayers.Projection.transforms={};OpenLayers.Projection.addTransform=function(from,to,method){if(!OpenLayers.Projection.transforms[from]){OpenLayers.Projection.transforms[from]={};} +OpenLayers.Projection.transforms[from][to]=method;};OpenLayers.Projection.transform=function(point,source,dest){if(source.proj&&dest.proj){point=Proj4js.transform(source.proj,dest.proj,point);}else if(source&&dest&&OpenLayers.Projection.transforms[source.getCode()]&&OpenLayers.Projection.transforms[source.getCode()][dest.getCode()]){OpenLayers.Projection.transforms[source.getCode()][dest.getCode()](point);} +return point;};OpenLayers.Projection.nullTransform=function(point){return point;};OpenLayers.Format.KML=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{kml:"http://www.opengis.net/kml/2.2",gx:"http://www.google.com/kml/ext/2.2"},kmlns:"http://earth.google.com/kml/2.0",placemarksDesc:"No description available",foldersName:"OpenLayers export",foldersDesc:"Exported on "+new Date(),extractAttributes:true,extractStyles:false,extractTracks:false,trackAttributes:null,internalns:null,features:null,styles:null,styleBaseUrl:"",fetched:null,maxDepth:0,initialize:function(options){this.regExes={trimSpace:(/^\s*|\s*$/g),removeSpace:(/\s*/g),splitSpace:(/\s+/),trimComma:(/\s*,\s*/g),kmlColor:(/(\w{2})(\w{2})(\w{2})(\w{2})/),kmlIconPalette:(/root:\/\/icons\/palette-(\d+)(\.\w+)/),straightBracket:(/\$\[(.*?)\]/g)};this.externalProjection=new OpenLayers.Projection("EPSG:4326");OpenLayers.Format.XML.prototype.initialize.apply(this,[options]);},read:function(data){this.features=[];this.styles={};this.fetched={};var options={depth:0,styleBaseUrl:this.styleBaseUrl};return this.parseData(data,options);},parseData:function(data,options){if(typeof data=="string"){data=OpenLayers.Format.XML.prototype.read.apply(this,[data]);} +var types=["Link","NetworkLink","Style","StyleMap","Placemark"];for(var i=0,len=types.length;i<len;++i){var type=types[i];var nodes=this.getElementsByTagNameNS(data,"*",type);if(nodes.length==0){continue;} +switch(type.toLowerCase()){case"link":case"networklink":this.parseLinks(nodes,options);break;case"style":if(this.extractStyles){this.parseStyles(nodes,options);} +break;case"stylemap":if(this.extractStyles){this.parseStyleMaps(nodes,options);} +break;case"placemark":this.parseFeatures(nodes,options);break;}} +return this.features;},parseLinks:function(nodes,options){if(options.depth>=this.maxDepth){return false;} +var newOptions=OpenLayers.Util.extend({},options);newOptions.depth++;for(var i=0,len=nodes.length;i<len;i++){var href=this.parseProperty(nodes[i],"*","href");if(href&&!this.fetched[href]){this.fetched[href]=true;var data=this.fetchLink(href);if(data){this.parseData(data,newOptions);}}}},fetchLink:function(href){var request=OpenLayers.Request.GET({url:href,async:false});if(request){return request.responseText;}},parseStyles:function(nodes,options){for(var i=0,len=nodes.length;i<len;i++){var style=this.parseStyle(nodes[i]);if(style){var styleName=(options.styleBaseUrl||"")+"#"+style.id;this.styles[styleName]=style;}}},parseKmlColor:function(kmlColor){var color=null;if(kmlColor){var matches=kmlColor.match(this.regExes.kmlColor);if(matches){color={color:'#'+matches[4]+matches[3]+matches[2],opacity:parseInt(matches[1],16)/255};}} +return color;},parseStyle:function(node){var style={};var types=["LineStyle","PolyStyle","IconStyle","BalloonStyle","LabelStyle"];var type,styleTypeNode,nodeList,geometry,parser;for(var i=0,len=types.length;i<len;++i){type=types[i];styleTypeNode=this.getElementsByTagNameNS(node,"*",type)[0];if(!styleTypeNode){continue;} +switch(type.toLowerCase()){case"linestyle":var kmlColor=this.parseProperty(styleTypeNode,"*","color");var color=this.parseKmlColor(kmlColor);if(color){style["strokeColor"]=color.color;style["strokeOpacity"]=color.opacity;} +var width=this.parseProperty(styleTypeNode,"*","width");if(width){style["strokeWidth"]=width;} +break;case"polystyle":var kmlColor=this.parseProperty(styleTypeNode,"*","color");var color=this.parseKmlColor(kmlColor);if(color){style["fillOpacity"]=color.opacity;style["fillColor"]=color.color;} +var fill=this.parseProperty(styleTypeNode,"*","fill");if(fill=="0"){style["fillColor"]="none";} +var outline=this.parseProperty(styleTypeNode,"*","outline");if(outline=="0"){style["strokeWidth"]="0";} +break;case"iconstyle":var scale=parseFloat(this.parseProperty(styleTypeNode,"*","scale")||1);var width=32*scale;var height=32*scale;var iconNode=this.getElementsByTagNameNS(styleTypeNode,"*","Icon")[0];if(iconNode){var href=this.parseProperty(iconNode,"*","href");if(href){var w=this.parseProperty(iconNode,"*","w");var h=this.parseProperty(iconNode,"*","h");var google="http://maps.google.com/mapfiles/kml";if(OpenLayers.String.startsWith(href,google)&&!w&&!h){w=64;h=64;scale=scale/2;} +w=w||h;h=h||w;if(w){width=parseInt(w)*scale;} +if(h){height=parseInt(h)*scale;} +var matches=href.match(this.regExes.kmlIconPalette);if(matches){var palette=matches[1];var file_extension=matches[2];var x=this.parseProperty(iconNode,"*","x");var y=this.parseProperty(iconNode,"*","y");var posX=x?x/32:0;var posY=y?(7-y/32):7;var pos=posY*8+posX;href="http://maps.google.com/mapfiles/kml/pal" ++palette+"/icon"+pos+file_extension;} +style["graphicOpacity"]=1;style["externalGraphic"]=href;}} +var hotSpotNode=this.getElementsByTagNameNS(styleTypeNode,"*","hotSpot")[0];if(hotSpotNode){var x=parseFloat(hotSpotNode.getAttribute("x"));var y=parseFloat(hotSpotNode.getAttribute("y"));var xUnits=hotSpotNode.getAttribute("xunits");if(xUnits=="pixels"){style["graphicXOffset"]=-x*scale;} +else if(xUnits=="insetPixels"){style["graphicXOffset"]=-width+(x*scale);} +else if(xUnits=="fraction"){style["graphicXOffset"]=-width*x;} +var yUnits=hotSpotNode.getAttribute("yunits");if(yUnits=="pixels"){style["graphicYOffset"]=-height+(y*scale)+1;} +else if(yUnits=="insetPixels"){style["graphicYOffset"]=-(y*scale)+1;} +else if(yUnits=="fraction"){style["graphicYOffset"]=-height*(1-y)+1;}} +style["graphicWidth"]=width;style["graphicHeight"]=height;break;case"balloonstyle":var balloonStyle=OpenLayers.Util.getXmlNodeValue(styleTypeNode);if(balloonStyle){style["balloonStyle"]=balloonStyle.replace(this.regExes.straightBracket,"${$1}");} +break;case"labelstyle":var kmlColor=this.parseProperty(styleTypeNode,"*","color");var color=this.parseKmlColor(kmlColor);if(color){style["fontColor"]=color.color;style["fontOpacity"]=color.opacity;} +break;default:}} +if(!style["strokeColor"]&&style["fillColor"]){style["strokeColor"]=style["fillColor"];} +var id=node.getAttribute("id");if(id&&style){style.id=id;} +return style;},parseStyleMaps:function(nodes,options){for(var i=0,len=nodes.length;i<len;i++){var node=nodes[i];var pairs=this.getElementsByTagNameNS(node,"*","Pair");var id=node.getAttribute("id");for(var j=0,jlen=pairs.length;j<jlen;j++){var pair=pairs[j];var key=this.parseProperty(pair,"*","key");var styleUrl=this.parseProperty(pair,"*","styleUrl");if(styleUrl&&key=="normal"){this.styles[(options.styleBaseUrl||"")+"#"+id]=this.styles[(options.styleBaseUrl||"")+styleUrl];} +if(styleUrl&&key=="highlight"){}}}},parseFeatures:function(nodes,options){var features=[];for(var i=0,len=nodes.length;i<len;i++){var featureNode=nodes[i];var feature=this.parseFeature.apply(this,[featureNode]);if(feature){if(this.extractStyles&&feature.attributes&&feature.attributes.styleUrl){feature.style=this.getStyle(feature.attributes.styleUrl,options);} +if(this.extractStyles){var inlineStyleNode=this.getElementsByTagNameNS(featureNode,"*","Style")[0];if(inlineStyleNode){var inlineStyle=this.parseStyle(inlineStyleNode);if(inlineStyle){feature.style=OpenLayers.Util.extend(feature.style,inlineStyle);}}} +if(this.extractTracks){var tracks=this.getElementsByTagNameNS(featureNode,this.namespaces.gx,"Track");if(tracks&&tracks.length>0){var track=tracks[0];var container={features:[],feature:feature};this.readNode(track,container);if(container.features.length>0){features.push.apply(features,container.features);}}}else{features.push(feature);}}else{throw"Bad Placemark: "+i;}} +this.features=this.features.concat(features);},readers:{"kml":{"when":function(node,container){container.whens.push(OpenLayers.Date.parse(this.getChildValue(node)));},"_trackPointAttribute":function(node,container){var name=node.nodeName.split(":").pop();container.attributes[name].push(this.getChildValue(node));}},"gx":{"Track":function(node,container){var obj={whens:[],points:[],angles:[]};if(this.trackAttributes){var name;obj.attributes={};for(var i=0,ii=this.trackAttributes.length;i<ii;++i){name=this.trackAttributes[i];obj.attributes[name]=[];if(!(name in this.readers.kml)){this.readers.kml[name]=this.readers.kml._trackPointAttribute;}}} +this.readChildNodes(node,obj);if(obj.whens.length!==obj.points.length){throw new Error("gx:Track with unequal number of when ("+obj.whens.length+") and gx:coord ("+obj.points.length+") elements.");} +var hasAngles=obj.angles.length>0;if(hasAngles&&obj.whens.length!==obj.angles.length){throw new Error("gx:Track with unequal number of when ("+obj.whens.length+") and gx:angles ("+obj.angles.length+") elements.");} +var feature,point,angles;for(var i=0,ii=obj.whens.length;i<ii;++i){feature=container.feature.clone();feature.fid=container.feature.fid||container.feature.id;point=obj.points[i];feature.geometry=point;if("z"in point){feature.attributes.altitude=point.z;} +if(this.internalProjection&&this.externalProjection){feature.geometry.transform(this.externalProjection,this.internalProjection);} +if(this.trackAttributes){for(var j=0,jj=this.trackAttributes.length;j<jj;++j){feature.attributes[name]=obj.attributes[this.trackAttributes[j]][i];}} +feature.attributes.when=obj.whens[i];feature.attributes.trackId=container.feature.id;if(hasAngles){angles=obj.angles[i];feature.attributes.heading=parseFloat(angles[0]);feature.attributes.tilt=parseFloat(angles[1]);feature.attributes.roll=parseFloat(angles[2]);} +container.features.push(feature);}},"coord":function(node,container){var str=this.getChildValue(node);var coords=str.replace(this.regExes.trimSpace,"").split(/\s+/);var point=new OpenLayers.Geometry.Point(coords[0],coords[1]);if(coords.length>2){point.z=parseFloat(coords[2]);} +container.points.push(point);},"angles":function(node,container){var str=this.getChildValue(node);var parts=str.replace(this.regExes.trimSpace,"").split(/\s+/);container.angles.push(parts);}}},parseFeature:function(node){var order=["MultiGeometry","Polygon","LineString","Point"];var type,nodeList,geometry,parser;for(var i=0,len=order.length;i<len;++i){type=order[i];this.internalns=node.namespaceURI?node.namespaceURI:this.kmlns;nodeList=this.getElementsByTagNameNS(node,this.internalns,type);if(nodeList.length>0){var parser=this.parseGeometry[type.toLowerCase()];if(parser){geometry=parser.apply(this,[nodeList[0]]);if(this.internalProjection&&this.externalProjection){geometry.transform(this.externalProjection,this.internalProjection);}}else{OpenLayers.Console.error(OpenLayers.i18n("unsupportedGeometryType",{'geomType':type}));} +break;}} +var attributes;if(this.extractAttributes){attributes=this.parseAttributes(node);} +var feature=new OpenLayers.Feature.Vector(geometry,attributes);var fid=node.getAttribute("id")||node.getAttribute("name");if(fid!=null){feature.fid=fid;} +return feature;},getStyle:function(styleUrl,options){var styleBaseUrl=OpenLayers.Util.removeTail(styleUrl);var newOptions=OpenLayers.Util.extend({},options);newOptions.depth++;newOptions.styleBaseUrl=styleBaseUrl;if(!this.styles[styleUrl]&&!OpenLayers.String.startsWith(styleUrl,"#")&&newOptions.depth<=this.maxDepth&&!this.fetched[styleBaseUrl]){var data=this.fetchLink(styleBaseUrl);if(data){this.parseData(data,newOptions);}} +var style=OpenLayers.Util.extend({},this.styles[styleUrl]);return style;},parseGeometry:{point:function(node){var nodeList=this.getElementsByTagNameNS(node,this.internalns,"coordinates");var coords=[];if(nodeList.length>0){var coordString=nodeList[0].firstChild.nodeValue;coordString=coordString.replace(this.regExes.removeSpace,"");coords=coordString.split(",");} +var point=null;if(coords.length>1){if(coords.length==2){coords[2]=null;} +point=new OpenLayers.Geometry.Point(coords[0],coords[1],coords[2]);}else{throw"Bad coordinate string: "+coordString;} +return point;},linestring:function(node,ring){var nodeList=this.getElementsByTagNameNS(node,this.internalns,"coordinates");var line=null;if(nodeList.length>0){var coordString=this.getChildValue(nodeList[0]);coordString=coordString.replace(this.regExes.trimSpace,"");coordString=coordString.replace(this.regExes.trimComma,",");var pointList=coordString.split(this.regExes.splitSpace);var numPoints=pointList.length;var points=new Array(numPoints);var coords,numCoords;for(var i=0;i<numPoints;++i){coords=pointList[i].split(",");numCoords=coords.length;if(numCoords>1){if(coords.length==2){coords[2]=null;} +points[i]=new OpenLayers.Geometry.Point(coords[0],coords[1],coords[2]);}else{throw"Bad LineString point coordinates: "+ +pointList[i];}} +if(numPoints){if(ring){line=new OpenLayers.Geometry.LinearRing(points);}else{line=new OpenLayers.Geometry.LineString(points);}}else{throw"Bad LineString coordinates: "+coordString;}} +return line;},polygon:function(node){var nodeList=this.getElementsByTagNameNS(node,this.internalns,"LinearRing");var numRings=nodeList.length;var components=new Array(numRings);if(numRings>0){var ring;for(var i=0,len=nodeList.length;i<len;++i){ring=this.parseGeometry.linestring.apply(this,[nodeList[i],true]);if(ring){components[i]=ring;}else{throw"Bad LinearRing geometry: "+i;}}} +return new OpenLayers.Geometry.Polygon(components);},multigeometry:function(node){var child,parser;var parts=[];var children=node.childNodes;for(var i=0,len=children.length;i<len;++i){child=children[i];if(child.nodeType==1){var type=(child.prefix)?child.nodeName.split(":")[1]:child.nodeName;var parser=this.parseGeometry[type.toLowerCase()];if(parser){parts.push(parser.apply(this,[child]));}}} +return new OpenLayers.Geometry.Collection(parts);}},parseAttributes:function(node){var attributes={};var edNodes=node.getElementsByTagName("ExtendedData");if(edNodes.length){attributes=this.parseExtendedData(edNodes[0]);} +var child,grandchildren,grandchild;var children=node.childNodes;for(var i=0,len=children.length;i<len;++i){child=children[i];if(child.nodeType==1){grandchildren=child.childNodes;if(grandchildren.length>=1&&grandchildren.length<=3){var grandchild;switch(grandchildren.length){case 1:grandchild=grandchildren[0];break;case 2:var c1=grandchildren[0];var c2=grandchildren[1];grandchild=(c1.nodeType==3||c1.nodeType==4)?c1:c2;break;case 3:default:grandchild=grandchildren[1];break;} +if(grandchild.nodeType==3||grandchild.nodeType==4){var name=(child.prefix)?child.nodeName.split(":")[1]:child.nodeName;var value=OpenLayers.Util.getXmlNodeValue(grandchild);if(value){value=value.replace(this.regExes.trimSpace,"");attributes[name]=value;}}}}} +return attributes;},parseExtendedData:function(node){var attributes={};var i,len,data,key;var dataNodes=node.getElementsByTagName("Data");for(i=0,len=dataNodes.length;i<len;i++){data=dataNodes[i];key=data.getAttribute("name");var ed={};var valueNode=data.getElementsByTagName("value");if(valueNode.length){ed['value']=this.getChildValue(valueNode[0]);} +var nameNode=data.getElementsByTagName("displayName");if(nameNode.length){ed['displayName']=this.getChildValue(nameNode[0]);} +attributes[key]=ed;} +var simpleDataNodes=node.getElementsByTagName("SimpleData");for(i=0,len=simpleDataNodes.length;i<len;i++){var ed={};data=simpleDataNodes[i];key=data.getAttribute("name");ed['value']=this.getChildValue(data);ed['displayName']=key;attributes[key]=ed;} +return attributes;},parseProperty:function(xmlNode,namespace,tagName){var value;var nodeList=this.getElementsByTagNameNS(xmlNode,namespace,tagName);try{value=OpenLayers.Util.getXmlNodeValue(nodeList[0]);}catch(e){value=null;} +return value;},write:function(features){if(!(OpenLayers.Util.isArray(features))){features=[features];} +var kml=this.createElementNS(this.kmlns,"kml");var folder=this.createFolderXML();for(var i=0,len=features.length;i<len;++i){folder.appendChild(this.createPlacemarkXML(features[i]));} +kml.appendChild(folder);return OpenLayers.Format.XML.prototype.write.apply(this,[kml]);},createFolderXML:function(){var folder=this.createElementNS(this.kmlns,"Folder");if(this.foldersName){var folderName=this.createElementNS(this.kmlns,"name");var folderNameText=this.createTextNode(this.foldersName);folderName.appendChild(folderNameText);folder.appendChild(folderName);} +if(this.foldersDesc){var folderDesc=this.createElementNS(this.kmlns,"description");var folderDescText=this.createTextNode(this.foldersDesc);folderDesc.appendChild(folderDescText);folder.appendChild(folderDesc);} +return folder;},createPlacemarkXML:function(feature){var placemarkName=this.createElementNS(this.kmlns,"name");var name=feature.style&&feature.style.label?feature.style.label:feature.attributes.name||feature.id;placemarkName.appendChild(this.createTextNode(name));var placemarkDesc=this.createElementNS(this.kmlns,"description");var desc=feature.attributes.description||this.placemarksDesc;placemarkDesc.appendChild(this.createTextNode(desc));var placemarkNode=this.createElementNS(this.kmlns,"Placemark");if(feature.fid!=null){placemarkNode.setAttribute("id",feature.fid);} +placemarkNode.appendChild(placemarkName);placemarkNode.appendChild(placemarkDesc);var geometryNode=this.buildGeometryNode(feature.geometry);placemarkNode.appendChild(geometryNode);return placemarkNode;},buildGeometryNode:function(geometry){var className=geometry.CLASS_NAME;var type=className.substring(className.lastIndexOf(".")+1);var builder=this.buildGeometry[type.toLowerCase()];var node=null;if(builder){node=builder.apply(this,[geometry]);} +return node;},buildGeometry:{point:function(geometry){var kml=this.createElementNS(this.kmlns,"Point");kml.appendChild(this.buildCoordinatesNode(geometry));return kml;},multipoint:function(geometry){return this.buildGeometry.collection.apply(this,[geometry]);},linestring:function(geometry){var kml=this.createElementNS(this.kmlns,"LineString");kml.appendChild(this.buildCoordinatesNode(geometry));return kml;},multilinestring:function(geometry){return this.buildGeometry.collection.apply(this,[geometry]);},linearring:function(geometry){var kml=this.createElementNS(this.kmlns,"LinearRing");kml.appendChild(this.buildCoordinatesNode(geometry));return kml;},polygon:function(geometry){var kml=this.createElementNS(this.kmlns,"Polygon");var rings=geometry.components;var ringMember,ringGeom,type;for(var i=0,len=rings.length;i<len;++i){type=(i==0)?"outerBoundaryIs":"innerBoundaryIs";ringMember=this.createElementNS(this.kmlns,type);ringGeom=this.buildGeometry.linearring.apply(this,[rings[i]]);ringMember.appendChild(ringGeom);kml.appendChild(ringMember);} +return kml;},multipolygon:function(geometry){return this.buildGeometry.collection.apply(this,[geometry]);},collection:function(geometry){var kml=this.createElementNS(this.kmlns,"MultiGeometry");var child;for(var i=0,len=geometry.components.length;i<len;++i){child=this.buildGeometryNode.apply(this,[geometry.components[i]]);if(child){kml.appendChild(child);}} +return kml;}},buildCoordinatesNode:function(geometry){var coordinatesNode=this.createElementNS(this.kmlns,"coordinates");var path;var points=geometry.components;if(points){var point;var numPoints=points.length;var parts=new Array(numPoints);for(var i=0;i<numPoints;++i){point=points[i];parts[i]=this.buildCoordinates(point);} +path=parts.join(" ");}else{path=this.buildCoordinates(geometry);} +var txtNode=this.createTextNode(path);coordinatesNode.appendChild(txtNode);return coordinatesNode;},buildCoordinates:function(point){if(this.internalProjection&&this.externalProjection){point=point.clone();point.transform(this.internalProjection,this.externalProjection);} +return point.x+","+point.y;},CLASS_NAME:"OpenLayers.Format.KML"});OpenLayers.Style=OpenLayers.Class({id:null,name:null,title:null,description:null,layerName:null,isDefault:false,rules:null,context:null,defaultStyle:null,defaultsPerSymbolizer:false,propertyStyles:null,initialize:function(style,options){OpenLayers.Util.extend(this,options);this.rules=[];if(options&&options.rules){this.addRules(options.rules);} +this.setDefaultStyle(style||OpenLayers.Feature.Vector.style["default"]);this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_");},destroy:function(){for(var i=0,len=this.rules.length;i<len;i++){this.rules[i].destroy();this.rules[i]=null;} +this.rules=null;this.defaultStyle=null;},createSymbolizer:function(feature){var style=this.defaultsPerSymbolizer?{}:this.createLiterals(OpenLayers.Util.extend({},this.defaultStyle),feature);var rules=this.rules;var rule,context;var elseRules=[];var appliedRules=false;for(var i=0,len=rules.length;i<len;i++){rule=rules[i];var applies=rule.evaluate(feature);if(applies){if(rule instanceof OpenLayers.Rule&&rule.elseFilter){elseRules.push(rule);}else{appliedRules=true;this.applySymbolizer(rule,style,feature);}}} +if(appliedRules==false&&elseRules.length>0){appliedRules=true;for(var i=0,len=elseRules.length;i<len;i++){this.applySymbolizer(elseRules[i],style,feature);}} +if(rules.length>0&&appliedRules==false){style.display="none";} +if(style.label&&typeof style.label!=="string"){style.label=String(style.label);} +return style;},applySymbolizer:function(rule,style,feature){var symbolizerPrefix=feature.geometry?this.getSymbolizerPrefix(feature.geometry):OpenLayers.Style.SYMBOLIZER_PREFIXES[0];var symbolizer=rule.symbolizer[symbolizerPrefix]||rule.symbolizer;if(this.defaultsPerSymbolizer===true){var defaults=this.defaultStyle;OpenLayers.Util.applyDefaults(symbolizer,{pointRadius:defaults.pointRadius});if(symbolizer.stroke===true||symbolizer.graphic===true){OpenLayers.Util.applyDefaults(symbolizer,{strokeWidth:defaults.strokeWidth,strokeColor:defaults.strokeColor,strokeOpacity:defaults.strokeOpacity,strokeDashstyle:defaults.strokeDashstyle,strokeLinecap:defaults.strokeLinecap});} +if(symbolizer.fill===true||symbolizer.graphic===true){OpenLayers.Util.applyDefaults(symbolizer,{fillColor:defaults.fillColor,fillOpacity:defaults.fillOpacity});} +if(symbolizer.graphic===true){OpenLayers.Util.applyDefaults(symbolizer,{pointRadius:this.defaultStyle.pointRadius,externalGraphic:this.defaultStyle.externalGraphic,graphicName:this.defaultStyle.graphicName,graphicOpacity:this.defaultStyle.graphicOpacity,graphicWidth:this.defaultStyle.graphicWidth,graphicHeight:this.defaultStyle.graphicHeight,graphicXOffset:this.defaultStyle.graphicXOffset,graphicYOffset:this.defaultStyle.graphicYOffset});}} +return this.createLiterals(OpenLayers.Util.extend(style,symbolizer),feature);},createLiterals:function(style,feature){var context=OpenLayers.Util.extend({},feature.attributes||feature.data);OpenLayers.Util.extend(context,this.context);for(var i in this.propertyStyles){style[i]=OpenLayers.Style.createLiteral(style[i],context,feature,i);} +return style;},findPropertyStyles:function(){var propertyStyles={};var style=this.defaultStyle;this.addPropertyStyles(propertyStyles,style);var rules=this.rules;var symbolizer,value;for(var i=0,len=rules.length;i<len;i++){symbolizer=rules[i].symbolizer;for(var key in symbolizer){value=symbolizer[key];if(typeof value=="object"){this.addPropertyStyles(propertyStyles,value);}else{this.addPropertyStyles(propertyStyles,symbolizer);break;}}} +return propertyStyles;},addPropertyStyles:function(propertyStyles,symbolizer){var property;for(var key in symbolizer){property=symbolizer[key];if(typeof property=="string"&&property.match(/\$\{\w+\}/)){propertyStyles[key]=true;}} +return propertyStyles;},addRules:function(rules){Array.prototype.push.apply(this.rules,rules);this.propertyStyles=this.findPropertyStyles();},setDefaultStyle:function(style){this.defaultStyle=style;this.propertyStyles=this.findPropertyStyles();},getSymbolizerPrefix:function(geometry){var prefixes=OpenLayers.Style.SYMBOLIZER_PREFIXES;for(var i=0,len=prefixes.length;i<len;i++){if(geometry.CLASS_NAME.indexOf(prefixes[i])!=-1){return prefixes[i];}}},clone:function(){var options=OpenLayers.Util.extend({},this);if(this.rules){options.rules=[];for(var i=0,len=this.rules.length;i<len;++i){options.rules.push(this.rules[i].clone());}} +options.context=this.context&&OpenLayers.Util.extend({},this.context);var defaultStyle=OpenLayers.Util.extend({},this.defaultStyle);return new OpenLayers.Style(defaultStyle,options);},CLASS_NAME:"OpenLayers.Style"});OpenLayers.Style.createLiteral=function(value,context,feature,property){if(typeof value=="string"&&value.indexOf("${")!=-1){value=OpenLayers.String.format(value,context,[feature,property]);value=(isNaN(value)||!value)?value:parseFloat(value);} +return value;};OpenLayers.Style.SYMBOLIZER_PREFIXES=['Point','Line','Polygon','Text','Raster'];OpenLayers.Filter=OpenLayers.Class({initialize:function(options){OpenLayers.Util.extend(this,options);},destroy:function(){},evaluate:function(context){return true;},clone:function(){return null;},CLASS_NAME:"OpenLayers.Filter"});OpenLayers.Filter.Spatial=OpenLayers.Class(OpenLayers.Filter,{type:null,property:null,value:null,distance:null,distanceUnits:null,initialize:function(options){OpenLayers.Filter.prototype.initialize.apply(this,[options]);},evaluate:function(feature){var intersect=false;switch(this.type){case OpenLayers.Filter.Spatial.BBOX:case OpenLayers.Filter.Spatial.INTERSECTS:if(feature.geometry){var geom=this.value;if(this.value.CLASS_NAME=="OpenLayers.Bounds"){geom=this.value.toGeometry();} +if(feature.geometry.intersects(geom)){intersect=true;}} +break;default:OpenLayers.Console.error(OpenLayers.i18n("filterEvaluateNotImplemented"));break;} +return intersect;},clone:function(){var options=OpenLayers.Util.applyDefaults({value:this.value&&this.value.clone&&this.value.clone()},this);return new OpenLayers.Filter.Spatial(options);},CLASS_NAME:"OpenLayers.Filter.Spatial"});OpenLayers.Filter.Spatial.BBOX="BBOX";OpenLayers.Filter.Spatial.INTERSECTS="INTERSECTS";OpenLayers.Filter.Spatial.DWITHIN="DWITHIN";OpenLayers.Filter.Spatial.WITHIN="WITHIN";OpenLayers.Filter.Spatial.CONTAINS="CONTAINS";OpenLayers.Strategy.BBOX=OpenLayers.Class(OpenLayers.Strategy,{bounds:null,resolution:null,ratio:2,resFactor:null,response:null,activate:function(){var activated=OpenLayers.Strategy.prototype.activate.call(this);if(activated){this.layer.events.on({"moveend":this.update,scope:this});this.layer.events.on({"refresh":this.update,scope:this});if(this.layer.visibility===true&&this.layer.inRange===true){this.update();}else{this.layer.events.on({"visibilitychanged":this.update,scope:this});}} +return activated;},deactivate:function(){var deactivated=OpenLayers.Strategy.prototype.deactivate.call(this);if(deactivated){this.layer.events.un({"moveend":this.update,"refresh":this.update,"visibilitychanged":this.update,scope:this});} +return deactivated;},update:function(options){var mapBounds=this.getMapBounds();if(mapBounds!==null&&((options&&options.force)||this.invalidBounds(mapBounds))){this.calculateBounds(mapBounds);this.resolution=this.layer.map.getResolution();this.triggerRead(options);}},getMapBounds:function(){if(this.layer.map===null){return null;} +var bounds=this.layer.map.getExtent();if(bounds&&!this.layer.projection.equals(this.layer.map.getProjectionObject())){bounds=bounds.clone().transform(this.layer.map.getProjectionObject(),this.layer.projection);} +return bounds;},invalidBounds:function(mapBounds){if(!mapBounds){mapBounds=this.getMapBounds();} +var invalid=!this.bounds||!this.bounds.containsBounds(mapBounds);if(!invalid&&this.resFactor){var ratio=this.resolution/this.layer.map.getResolution();invalid=(ratio>=this.resFactor||ratio<=(1/this.resFactor));} +return invalid;},calculateBounds:function(mapBounds){if(!mapBounds){mapBounds=this.getMapBounds();} +var center=mapBounds.getCenterLonLat();var dataWidth=mapBounds.getWidth()*this.ratio;var dataHeight=mapBounds.getHeight()*this.ratio;this.bounds=new OpenLayers.Bounds(center.lon-(dataWidth/2),center.lat-(dataHeight/2),center.lon+(dataWidth/2),center.lat+(dataHeight/2));},triggerRead:function(options){if(this.response){this.layer.protocol.abort(this.response);this.layer.events.triggerEvent("loadend");} +this.layer.events.triggerEvent("loadstart");this.response=this.layer.protocol.read(OpenLayers.Util.applyDefaults({filter:this.createFilter(),callback:this.merge,scope:this},options));},createFilter:function(){var filter=new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.BBOX,value:this.bounds,projection:this.layer.projection});if(this.layer.filter){filter=new OpenLayers.Filter.Logical({type:OpenLayers.Filter.Logical.AND,filters:[this.layer.filter,filter]});} +return filter;},merge:function(resp){this.layer.destroyFeatures();var features=resp.features;if(features&&features.length>0){var remote=this.layer.projection;var local=this.layer.map.getProjectionObject();if(!local.equals(remote)){var geom;for(var i=0,len=features.length;i<len;++i){geom=features[i].geometry;if(geom){geom.transform(remote,local);}}} +this.layer.addFeatures(features);} +this.response=null;this.layer.events.triggerEvent("loadend");},CLASS_NAME:"OpenLayers.Strategy.BBOX"});OpenLayers.Handler.Feature=OpenLayers.Class(OpenLayers.Handler,{EVENTMAP:{'click':{'in':'click','out':'clickout'},'mousemove':{'in':'over','out':'out'},'dblclick':{'in':'dblclick','out':null},'mousedown':{'in':null,'out':null},'mouseup':{'in':null,'out':null},'touchstart':{'in':'click','out':'clickout'}},feature:null,lastFeature:null,down:null,up:null,touch:false,clickTolerance:4,geometryTypes:null,stopClick:true,stopDown:true,stopUp:false,initialize:function(control,layer,callbacks,options){OpenLayers.Handler.prototype.initialize.apply(this,[control,callbacks,options]);this.layer=layer;},touchstart:function(evt){if(!this.touch){this.touch=true;this.map.events.un({mousedown:this.mousedown,mouseup:this.mouseup,mousemove:this.mousemove,click:this.click,dblclick:this.dblclick,scope:this});} +return OpenLayers.Event.isMultiTouch(evt)?true:this.mousedown(evt);},touchmove:function(evt){OpenLayers.Event.stop(evt);},mousedown:function(evt){this.down=evt.xy;return this.handle(evt)?!this.stopDown:true;},mouseup:function(evt){this.up=evt.xy;return this.handle(evt)?!this.stopUp:true;},click:function(evt){return this.handle(evt)?!this.stopClick:true;},mousemove:function(evt){if(!this.callbacks['over']&&!this.callbacks['out']){return true;} +this.handle(evt);return true;},dblclick:function(evt){return!this.handle(evt);},geometryTypeMatches:function(feature){return this.geometryTypes==null||OpenLayers.Util.indexOf(this.geometryTypes,feature.geometry.CLASS_NAME)>-1;},handle:function(evt){if(this.feature&&!this.feature.layer){this.feature=null;} +var type=evt.type;var handled=false;var previouslyIn=!!(this.feature);var click=(type=="click"||type=="dblclick"||type=="touchstart");this.feature=this.layer.getFeatureFromEvent(evt);if(this.feature&&!this.feature.layer){this.feature=null;} +if(this.lastFeature&&!this.lastFeature.layer){this.lastFeature=null;} +if(this.feature){if(type==="touchstart"){OpenLayers.Event.stop(evt);} +var inNew=(this.feature!=this.lastFeature);if(this.geometryTypeMatches(this.feature)){if(previouslyIn&&inNew){if(this.lastFeature){this.triggerCallback(type,'out',[this.lastFeature]);} +this.triggerCallback(type,'in',[this.feature]);}else if(!previouslyIn||click){this.triggerCallback(type,'in',[this.feature]);} +this.lastFeature=this.feature;handled=true;}else{if(this.lastFeature&&(previouslyIn&&inNew||click)){this.triggerCallback(type,'out',[this.lastFeature]);} +this.feature=null;}}else{if(this.lastFeature&&(previouslyIn||click)){this.triggerCallback(type,'out',[this.lastFeature]);}} +return handled;},triggerCallback:function(type,mode,args){var key=this.EVENTMAP[type][mode];if(key){if(type=='click'&&this.up&&this.down){var dpx=Math.sqrt(Math.pow(this.up.x-this.down.x,2)+ +Math.pow(this.up.y-this.down.y,2));if(dpx<=this.clickTolerance){this.callback(key,args);}}else{this.callback(key,args);}}},activate:function(){var activated=false;if(OpenLayers.Handler.prototype.activate.apply(this,arguments)){this.moveLayerToTop();this.map.events.on({"removelayer":this.handleMapEvents,"changelayer":this.handleMapEvents,scope:this});activated=true;} +return activated;},deactivate:function(){var deactivated=false;if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){this.moveLayerBack();this.feature=null;this.lastFeature=null;this.down=null;this.up=null;this.touch=false;this.map.events.un({"removelayer":this.handleMapEvents,"changelayer":this.handleMapEvents,scope:this});deactivated=true;} +return deactivated;},handleMapEvents:function(evt){if(evt.type=="removelayer"||evt.property=="order"){this.moveLayerToTop();}},moveLayerToTop:function(){var index=Math.max(this.map.Z_INDEX_BASE['Feature']-1,this.layer.getZIndex())+1;this.layer.setZIndex(index);},moveLayerBack:function(){var index=this.layer.getZIndex()-1;if(index>=this.map.Z_INDEX_BASE['Feature']){this.layer.setZIndex(index);}else{this.map.setLayerZIndex(this.layer,this.map.getLayerIndex(this.layer));}},CLASS_NAME:"OpenLayers.Handler.Feature"});OpenLayers.Tween=OpenLayers.Class({INTERVAL:10,easing:null,begin:null,finish:null,duration:null,callbacks:null,time:null,interval:null,playing:false,initialize:function(easing){this.easing=(easing)?easing:OpenLayers.Easing.Expo.easeOut;},start:function(begin,finish,duration,options){this.playing=true;this.begin=begin;this.finish=finish;this.duration=duration;this.callbacks=options.callbacks;this.time=0;if(this.interval){window.clearInterval(this.interval);this.interval=null;} +if(this.callbacks&&this.callbacks.start){this.callbacks.start.call(this,this.begin);} +this.interval=window.setInterval(OpenLayers.Function.bind(this.play,this),this.INTERVAL);},stop:function(){if(!this.playing){return;} +if(this.callbacks&&this.callbacks.done){this.callbacks.done.call(this,this.finish);} +window.clearInterval(this.interval);this.interval=null;this.playing=false;},play:function(){var value={};for(var i in this.begin){var b=this.begin[i];var f=this.finish[i];if(b==null||f==null||isNaN(b)||isNaN(f)){OpenLayers.Console.error('invalid value for Tween');} +var c=f-b;value[i]=this.easing.apply(this,[this.time,b,c,this.duration]);} +this.time++;if(this.callbacks&&this.callbacks.eachStep){this.callbacks.eachStep.call(this,value);} +if(this.time>this.duration){this.stop();}},CLASS_NAME:"OpenLayers.Tween"});OpenLayers.Easing={CLASS_NAME:"OpenLayers.Easing"};OpenLayers.Easing.Linear={easeIn:function(t,b,c,d){return c*t/d+b;},easeOut:function(t,b,c,d){return c*t/d+b;},easeInOut:function(t,b,c,d){return c*t/d+b;},CLASS_NAME:"OpenLayers.Easing.Linear"};OpenLayers.Easing.Expo={easeIn:function(t,b,c,d){return(t==0)?b:c*Math.pow(2,10*(t/d-1))+b;},easeOut:function(t,b,c,d){return(t==d)?b+c:c*(-Math.pow(2,-10*t/d)+1)+b;},easeInOut:function(t,b,c,d){if(t==0)return b;if(t==d)return b+c;if((t/=d/2)<1)return c/2*Math.pow(2,10*(t-1))+b;return c/2*(-Math.pow(2,-10*--t)+2)+b;},CLASS_NAME:"OpenLayers.Easing.Expo"};OpenLayers.Easing.Quad={easeIn:function(t,b,c,d){return c*(t/=d)*t+b;},easeOut:function(t,b,c,d){return-c*(t/=d)*(t-2)+b;},easeInOut:function(t,b,c,d){if((t/=d/2)<1)return c/2*t*t+b;return-c/2*((--t)*(t-2)-1)+b;},CLASS_NAME:"OpenLayers.Easing.Quad"};OpenLayers.Map=OpenLayers.Class({Z_INDEX_BASE:{BaseLayer:100,Overlay:325,Feature:725,Popup:750,Control:1000},EVENT_TYPES:["preaddlayer","addlayer","preremovelayer","removelayer","changelayer","movestart","move","moveend","zoomend","popupopen","popupclose","addmarker","removemarker","clearmarkers","mouseover","mouseout","mousemove","dragstart","drag","dragend","changebaselayer"],id:null,fractionalZoom:false,events:null,allOverlays:false,div:null,dragging:false,size:null,viewPortDiv:null,layerContainerOrigin:null,layerContainerDiv:null,layers:null,controls:null,popups:null,baseLayer:null,center:null,resolution:null,zoom:0,panRatio:1.5,viewRequestID:0,tileSize:null,projection:"EPSG:4326",units:'degrees',resolutions:null,maxResolution:1.40625,minResolution:null,maxScale:null,minScale:null,maxExtent:null,minExtent:null,restrictedExtent:null,numZoomLevels:16,theme:null,displayProjection:null,fallThrough:true,panTween:null,eventListeners:null,panMethod:OpenLayers.Easing.Expo.easeOut,panDuration:50,paddingForPopups:null,minPx:null,maxPx:null,initialize:function(div,options){if(arguments.length===1&&typeof div==="object"){options=div;div=options&&options.div;} +this.tileSize=new OpenLayers.Size(OpenLayers.Map.TILE_WIDTH,OpenLayers.Map.TILE_HEIGHT);this.maxExtent=new OpenLayers.Bounds(-180,-90,180,90);this.paddingForPopups=new OpenLayers.Bounds(15,15,15,15);this.theme=OpenLayers._getScriptLocation()+'theme/default/style.css';OpenLayers.Util.extend(this,options);this.layers=[];this.id=OpenLayers.Util.createUniqueID("OpenLayers.Map_");this.div=OpenLayers.Util.getElement(div);if(!this.div){this.div=document.createElement("div");this.div.style.height="1px";this.div.style.width="1px";} +OpenLayers.Element.addClass(this.div,'olMap');var id=this.id+"_OpenLayers_ViewPort";this.viewPortDiv=OpenLayers.Util.createDiv(id,null,null,null,"relative",null,"hidden");this.viewPortDiv.style.width="100%";this.viewPortDiv.style.height="100%";this.viewPortDiv.className="olMapViewport";this.div.appendChild(this.viewPortDiv);var eventsDiv=document.createElement("div");eventsDiv.id=this.id+"_events";eventsDiv.style.position="absolute";eventsDiv.style.width="100%";eventsDiv.style.height="100%";eventsDiv.style.zIndex=this.Z_INDEX_BASE.Control-1;this.viewPortDiv.appendChild(eventsDiv);this.eventsDiv=eventsDiv;this.events=new OpenLayers.Events(this,this.eventsDiv,this.EVENT_TYPES,this.fallThrough,{includeXY:true});id=this.id+"_OpenLayers_Container";this.layerContainerDiv=OpenLayers.Util.createDiv(id);this.layerContainerDiv.style.zIndex=this.Z_INDEX_BASE['Popup']-1;this.eventsDiv.appendChild(this.layerContainerDiv);this.updateSize();if(this.eventListeners instanceof Object){this.events.on(this.eventListeners);} +this.events.register("movestart",this,this.updateSize);if(OpenLayers.String.contains(navigator.appName,"Microsoft")){this.events.register("resize",this,this.updateSize);}else{this.updateSizeDestroy=OpenLayers.Function.bind(this.updateSize,this);OpenLayers.Event.observe(window,'resize',this.updateSizeDestroy);} +if(this.theme){var addNode=true;var nodes=document.getElementsByTagName('link');for(var i=0,len=nodes.length;i<len;++i){if(OpenLayers.Util.isEquivalentUrl(nodes.item(i).href,this.theme)){addNode=false;break;}} +if(addNode){var cssNode=document.createElement('link');cssNode.setAttribute('rel','stylesheet');cssNode.setAttribute('type','text/css');cssNode.setAttribute('href',this.theme);document.getElementsByTagName('head')[0].appendChild(cssNode);}} +if(this.controls==null){if(OpenLayers.Control!=null){this.controls=[new OpenLayers.Control.Navigation(),new OpenLayers.Control.PanZoom(),new OpenLayers.Control.ArgParser(),new OpenLayers.Control.Attribution()];}else{this.controls=[];}} +for(var i=0,len=this.controls.length;i<len;i++){this.addControlToMap(this.controls[i]);} +this.popups=[];this.unloadDestroy=OpenLayers.Function.bind(this.destroy,this);OpenLayers.Event.observe(window,'unload',this.unloadDestroy);if(options&&options.layers){delete this.center;this.addLayers(options.layers);if(options.center){this.setCenter(options.center,options.zoom);}}},render:function(div){this.div=OpenLayers.Util.getElement(div);OpenLayers.Element.addClass(this.div,'olMap');this.viewPortDiv.parentNode.removeChild(this.viewPortDiv);this.div.appendChild(this.viewPortDiv);this.updateSize();},unloadDestroy:null,updateSizeDestroy:null,destroy:function(){if(!this.unloadDestroy){return false;} +if(this.panTween){this.panTween.stop();this.panTween=null;} +OpenLayers.Event.stopObserving(window,'unload',this.unloadDestroy);this.unloadDestroy=null;if(this.updateSizeDestroy){OpenLayers.Event.stopObserving(window,'resize',this.updateSizeDestroy);}else{this.events.unregister("resize",this,this.updateSize);} +this.paddingForPopups=null;if(this.controls!=null){for(var i=this.controls.length-1;i>=0;--i){this.controls[i].destroy();} +this.controls=null;} +if(this.layers!=null){for(var i=this.layers.length-1;i>=0;--i){this.layers[i].destroy(false);} +this.layers=null;} +if(this.viewPortDiv){this.div.removeChild(this.viewPortDiv);} +this.viewPortDiv=null;if(this.eventListeners){this.events.un(this.eventListeners);this.eventListeners=null;} +this.events.destroy();this.events=null;},setOptions:function(options){var updatePxExtent=this.minPx&&options.restrictedExtent!=this.restrictedExtent;OpenLayers.Util.extend(this,options);updatePxExtent&&this.moveTo(this.getCachedCenter(),this.zoom,{forceZoomChange:true});},getTileSize:function(){return this.tileSize;},getBy:function(array,property,match){var test=(typeof match.test=="function");var found=OpenLayers.Array.filter(this[array],function(item){return item[property]==match||(test&&match.test(item[property]));});return found;},getLayersBy:function(property,match){return this.getBy("layers",property,match);},getLayersByName:function(match){return this.getLayersBy("name",match);},getLayersByClass:function(match){return this.getLayersBy("CLASS_NAME",match);},getControlsBy:function(property,match){return this.getBy("controls",property,match);},getControlsByClass:function(match){return this.getControlsBy("CLASS_NAME",match);},getLayer:function(id){var foundLayer=null;for(var i=0,len=this.layers.length;i<len;i++){var layer=this.layers[i];if(layer.id==id){foundLayer=layer;break;}} +return foundLayer;},setLayerZIndex:function(layer,zIdx){layer.setZIndex(this.Z_INDEX_BASE[layer.isBaseLayer?'BaseLayer':'Overlay'] ++zIdx*5);},resetLayersZIndex:function(){for(var i=0,len=this.layers.length;i<len;i++){var layer=this.layers[i];this.setLayerZIndex(layer,i);}},addLayer:function(layer){for(var i=0,len=this.layers.length;i<len;i++){if(this.layers[i]==layer){var msg=OpenLayers.i18n('layerAlreadyAdded',{'layerName':layer.name});OpenLayers.Console.warn(msg);return false;}} +if(this.events.triggerEvent("preaddlayer",{layer:layer})===false){return;} +if(this.allOverlays){layer.isBaseLayer=false;} +layer.div.className="olLayerDiv";layer.div.style.overflow="";this.setLayerZIndex(layer,this.layers.length);if(layer.isFixed){this.viewPortDiv.appendChild(layer.div);}else{this.layerContainerDiv.appendChild(layer.div);} +this.layers.push(layer);layer.setMap(this);if(layer.isBaseLayer||(this.allOverlays&&!this.baseLayer)){if(this.baseLayer==null){this.setBaseLayer(layer);}else{layer.setVisibility(false);}}else{layer.redraw();} +this.events.triggerEvent("addlayer",{layer:layer});layer.events.triggerEvent("added",{map:this,layer:layer});layer.afterAdd();},addLayers:function(layers){for(var i=0,len=layers.length;i<len;i++){this.addLayer(layers[i]);}},removeLayer:function(layer,setNewBaseLayer){if(this.events.triggerEvent("preremovelayer",{layer:layer})===false){return;} +if(setNewBaseLayer==null){setNewBaseLayer=true;} +if(layer.isFixed){this.viewPortDiv.removeChild(layer.div);}else{this.layerContainerDiv.removeChild(layer.div);} +OpenLayers.Util.removeItem(this.layers,layer);layer.removeMap(this);layer.map=null;if(this.baseLayer==layer){this.baseLayer=null;if(setNewBaseLayer){for(var i=0,len=this.layers.length;i<len;i++){var iLayer=this.layers[i];if(iLayer.isBaseLayer||this.allOverlays){this.setBaseLayer(iLayer);break;}}}} +this.resetLayersZIndex();this.events.triggerEvent("removelayer",{layer:layer});layer.events.triggerEvent("removed",{map:this,layer:layer});},getNumLayers:function(){return this.layers.length;},getLayerIndex:function(layer){return OpenLayers.Util.indexOf(this.layers,layer);},setLayerIndex:function(layer,idx){var base=this.getLayerIndex(layer);if(idx<0){idx=0;}else if(idx>this.layers.length){idx=this.layers.length;} +if(base!=idx){this.layers.splice(base,1);this.layers.splice(idx,0,layer);for(var i=0,len=this.layers.length;i<len;i++){this.setLayerZIndex(this.layers[i],i);} +this.events.triggerEvent("changelayer",{layer:layer,property:"order"});if(this.allOverlays){if(idx===0){this.setBaseLayer(layer);}else if(this.baseLayer!==this.layers[0]){this.setBaseLayer(this.layers[0]);}}}},raiseLayer:function(layer,delta){var idx=this.getLayerIndex(layer)+delta;this.setLayerIndex(layer,idx);},setBaseLayer:function(newBaseLayer){if(newBaseLayer!=this.baseLayer){if(OpenLayers.Util.indexOf(this.layers,newBaseLayer)!=-1){var center=this.getCachedCenter();var newResolution=OpenLayers.Util.getResolutionFromScale(this.getScale(),newBaseLayer.units);if(this.baseLayer!=null&&!this.allOverlays){this.baseLayer.setVisibility(false);} +this.baseLayer=newBaseLayer;this.viewRequestID++;if(!this.allOverlays||this.baseLayer.visibility){this.baseLayer.setVisibility(true);} +if(center!=null){var newZoom=this.getZoomForResolution(newResolution||this.resolution,true);this.setCenter(center,newZoom,false,true);} +this.events.triggerEvent("changebaselayer",{layer:this.baseLayer});}}},addControl:function(control,px){this.controls.push(control);this.addControlToMap(control,px);},addControls:function(controls,pixels){var pxs=(arguments.length===1)?[]:pixels;for(var i=0,len=controls.length;i<len;i++){var ctrl=controls[i];var px=(pxs[i])?pxs[i]:null;this.addControl(ctrl,px);}},addControlToMap:function(control,px){control.outsideViewport=(control.div!=null);if(this.displayProjection&&!control.displayProjection){control.displayProjection=this.displayProjection;} +control.setMap(this);var div=control.draw(px);if(div){if(!control.outsideViewport){div.style.zIndex=this.Z_INDEX_BASE['Control']+ +this.controls.length;this.viewPortDiv.appendChild(div);}} +if(control.autoActivate){control.activate();}},getControl:function(id){var returnControl=null;for(var i=0,len=this.controls.length;i<len;i++){var control=this.controls[i];if(control.id==id){returnControl=control;break;}} +return returnControl;},removeControl:function(control){if((control)&&(control==this.getControl(control.id))){if(control.div&&(control.div.parentNode==this.viewPortDiv)){this.viewPortDiv.removeChild(control.div);} +OpenLayers.Util.removeItem(this.controls,control);}},addPopup:function(popup,exclusive){if(exclusive){for(var i=this.popups.length-1;i>=0;--i){this.removePopup(this.popups[i]);}} +popup.map=this;this.popups.push(popup);var popupDiv=popup.draw();if(popupDiv){popupDiv.style.zIndex=this.Z_INDEX_BASE['Popup']+ +this.popups.length;this.layerContainerDiv.appendChild(popupDiv);}},removePopup:function(popup){OpenLayers.Util.removeItem(this.popups,popup);if(popup.div){try{this.layerContainerDiv.removeChild(popup.div);} +catch(e){}} +popup.map=null;},getSize:function(){var size=null;if(this.size!=null){size=this.size.clone();} +return size;},updateSize:function(){var newSize=this.getCurrentSize();if(newSize&&!isNaN(newSize.h)&&!isNaN(newSize.w)){this.events.clearMouseCache();var oldSize=this.getSize();if(oldSize==null){this.size=oldSize=newSize;} +if(!newSize.equals(oldSize)){this.size=newSize;for(var i=0,len=this.layers.length;i<len;i++){this.layers[i].onMapResize();} +var center=this.getCachedCenter();if(this.baseLayer!=null&¢er!=null){var zoom=this.getZoom();this.zoom=null;this.setCenter(center,zoom);}}}},getCurrentSize:function(){var size=new OpenLayers.Size(this.div.clientWidth,this.div.clientHeight);if(size.w==0&&size.h==0||isNaN(size.w)&&isNaN(size.h)){size.w=this.div.offsetWidth;size.h=this.div.offsetHeight;} +if(size.w==0&&size.h==0||isNaN(size.w)&&isNaN(size.h)){size.w=parseInt(this.div.style.width);size.h=parseInt(this.div.style.height);} +return size;},calculateBounds:function(center,resolution){var extent=null;if(center==null){center=this.getCachedCenter();} +if(resolution==null){resolution=this.getResolution();} +if((center!=null)&&(resolution!=null)){var size=this.getSize();var w_deg=size.w*resolution;var h_deg=size.h*resolution;extent=new OpenLayers.Bounds(center.lon-w_deg/2,center.lat-h_deg/2,center.lon+w_deg/2,center.lat+h_deg/2);} +return extent;},getCenter:function(){var center=null;var cachedCenter=this.getCachedCenter();if(cachedCenter){center=cachedCenter.clone();} +return center;},getCachedCenter:function(){if(!this.center&&this.size){this.center=this.getLonLatFromViewPortPx(new OpenLayers.Pixel(this.size.w/2,this.size.h/2));} +return this.center;},getZoom:function(){return this.zoom;},pan:function(dx,dy,options){options=OpenLayers.Util.applyDefaults(options,{animate:true,dragging:false});if(options.dragging){if(dx!=0||dy!=0){this.moveByPx(dx,dy);}}else{var centerPx=this.getViewPortPxFromLonLat(this.getCachedCenter());var newCenterPx=centerPx.add(dx,dy);if(this.dragging||!newCenterPx.equals(centerPx)){var newCenterLonLat=this.getLonLatFromViewPortPx(newCenterPx);if(options.animate){this.panTo(newCenterLonLat);}else{this.moveTo(newCenterLonLat);this.dragging=false;this.events.triggerEvent("moveend");}}}},panTo:function(lonlat){if(this.panMethod&&this.getExtent().scale(this.panRatio).containsLonLat(lonlat)){if(!this.panTween){this.panTween=new OpenLayers.Tween(this.panMethod);} +var center=this.getCachedCenter();if(lonlat.equals(center)){return;} +var from=this.getPixelFromLonLat(center);var to=this.getPixelFromLonLat(lonlat);var vector={x:to.x-from.x,y:to.y-from.y};var last={x:0,y:0};this.panTween.start({x:0,y:0},vector,this.panDuration,{callbacks:{eachStep:OpenLayers.Function.bind(function(px){var x=px.x-last.x,y=px.y-last.y;this.moveByPx(x,y);last.x=Math.round(px.x);last.y=Math.round(px.y);},this),done:OpenLayers.Function.bind(function(px){this.moveTo(lonlat);this.dragging=false;this.events.triggerEvent("moveend");},this)}});}else{this.setCenter(lonlat);}},setCenter:function(lonlat,zoom,dragging,forceZoomChange){this.panTween&&this.panTween.stop();this.moveTo(lonlat,zoom,{'dragging':dragging,'forceZoomChange':forceZoomChange});},moveByPx:function(dx,dy){var hw=this.size.w/2;var hh=this.size.h/2;var x=hw+dx;var y=hh+dy;var wrapDateLine=this.baseLayer.wrapDateLine;var xRestriction=0;var yRestriction=0;if(this.restrictedExtent){xRestriction=hw;yRestriction=hh;wrapDateLine=false;} +dx=wrapDateLine||x<=this.maxPx.x-xRestriction&&x>=this.minPx.x+xRestriction?Math.round(dx):0;dy=y<=this.maxPx.y-yRestriction&&y>=this.minPx.y+yRestriction?Math.round(dy):0;var minX=this.minPx.x,maxX=this.maxPx.x;if(dx||dy){if(!this.dragging){this.dragging=true;this.events.triggerEvent("movestart");} +this.center=null;if(dx){this.layerContainerDiv.style.left=parseInt(this.layerContainerDiv.style.left)-dx+"px";this.minPx.x-=dx;this.maxPx.x-=dx;if(wrapDateLine){if(this.maxPx.x>maxX){this.maxPx.x-=(maxX-minX);} +if(this.minPx.x<minX){this.minPx.x+=(maxX-minX);}}} +if(dy){this.layerContainerDiv.style.top=parseInt(this.layerContainerDiv.style.top)-dy+"px";this.minPx.y-=dy;this.maxPx.y-=dy;} +var layer,i,len;for(i=0,len=this.layers.length;i<len;++i){layer=this.layers[i];if(layer.visibility&&(layer===this.baseLayer||layer.inRange)){layer.moveByPx(dx,dy);layer.events.triggerEvent("move");}} +this.events.triggerEvent("move");}},moveTo:function(lonlat,zoom,options){if(!options){options={};} +if(zoom!=null){zoom=parseFloat(zoom);if(!this.fractionalZoom){zoom=Math.round(zoom);}} +var dragging=options.dragging||this.dragging;var forceZoomChange=options.forceZoomChange;if(!this.getCachedCenter()&&!this.isValidLonLat(lonlat)){lonlat=this.maxExtent.getCenterLonLat();this.center=lonlat.clone();} +if(this.restrictedExtent!=null){if(lonlat==null){lonlat=this.center;} +if(zoom==null){zoom=this.getZoom();} +var resolution=this.getResolutionForZoom(zoom);var extent=this.calculateBounds(lonlat,resolution);if(!this.restrictedExtent.containsBounds(extent)){var maxCenter=this.restrictedExtent.getCenterLonLat();if(extent.getWidth()>this.restrictedExtent.getWidth()){lonlat=new OpenLayers.LonLat(maxCenter.lon,lonlat.lat);}else if(extent.left<this.restrictedExtent.left){lonlat=lonlat.add(this.restrictedExtent.left- +extent.left,0);}else if(extent.right>this.restrictedExtent.right){lonlat=lonlat.add(this.restrictedExtent.right- +extent.right,0);} +if(extent.getHeight()>this.restrictedExtent.getHeight()){lonlat=new OpenLayers.LonLat(lonlat.lon,maxCenter.lat);}else if(extent.bottom<this.restrictedExtent.bottom){lonlat=lonlat.add(0,this.restrictedExtent.bottom- +extent.bottom);} +else if(extent.top>this.restrictedExtent.top){lonlat=lonlat.add(0,this.restrictedExtent.top- +extent.top);}}} +var zoomChanged=forceZoomChange||((this.isValidZoomLevel(zoom))&&(zoom!=this.getZoom()));var centerChanged=(this.isValidLonLat(lonlat))&&(!lonlat.equals(this.center));if(zoomChanged||centerChanged||dragging){dragging||this.events.triggerEvent("movestart");if(centerChanged){if(!zoomChanged&&this.center){this.centerLayerContainer(lonlat);} +this.center=lonlat.clone();} +var res=zoomChanged?this.getResolutionForZoom(zoom):this.getResolution();if(zoomChanged||this.layerContainerOrigin==null){this.layerContainerOrigin=this.getCachedCenter();this.layerContainerDiv.style.left="0px";this.layerContainerDiv.style.top="0px";var maxExtent=this.getMaxExtent({restricted:true});var maxExtentCenter=maxExtent.getCenterLonLat();var lonDelta=this.center.lon-maxExtentCenter.lon;var latDelta=maxExtentCenter.lat-this.center.lat;var extentWidth=Math.round(maxExtent.getWidth()/res);var extentHeight=Math.round(maxExtent.getHeight()/res);var left=(this.size.w-extentWidth)/2-lonDelta/res;var top=(this.size.h-extentHeight)/2-latDelta/res;this.minPx=new OpenLayers.Pixel(left,top);this.maxPx=new OpenLayers.Pixel(left+extentWidth,top+extentHeight);} +if(zoomChanged){this.zoom=zoom;this.resolution=res;this.viewRequestID++;} +var bounds=this.getExtent();if(this.baseLayer.visibility){this.baseLayer.moveTo(bounds,zoomChanged,options.dragging);options.dragging||this.baseLayer.events.triggerEvent("moveend",{zoomChanged:zoomChanged});} +bounds=this.baseLayer.getExtent();for(var i=this.layers.length-1;i>=0;--i){var layer=this.layers[i];if(layer!==this.baseLayer&&!layer.isBaseLayer){var inRange=layer.calculateInRange();if(layer.inRange!=inRange){layer.inRange=inRange;if(!inRange){layer.display(false);} +this.events.triggerEvent("changelayer",{layer:layer,property:"visibility"});} +if(inRange&&layer.visibility){layer.moveTo(bounds,zoomChanged,options.dragging);options.dragging||layer.events.triggerEvent("moveend",{zoomChanged:zoomChanged});}}} +this.events.triggerEvent("move");dragging||this.events.triggerEvent("moveend");if(zoomChanged){for(var i=0,len=this.popups.length;i<len;i++){this.popups[i].updatePosition();} +this.events.triggerEvent("zoomend");}}},centerLayerContainer:function(lonlat){var originPx=this.getViewPortPxFromLonLat(this.layerContainerOrigin);var newPx=this.getViewPortPxFromLonLat(lonlat);if((originPx!=null)&&(newPx!=null)){var oldLeft=parseInt(this.layerContainerDiv.style.left);var oldTop=parseInt(this.layerContainerDiv.style.top);var newLeft=Math.round(originPx.x-newPx.x);var newTop=Math.round(originPx.y-newPx.y);this.layerContainerDiv.style.left=newLeft+"px";this.layerContainerDiv.style.top=newTop+"px";var dx=oldLeft-newLeft;var dy=oldTop-newTop;this.minPx.x-=dx;this.maxPx.x-=dx;this.minPx.y-=dy;this.maxPx.y-=dy;}},isValidZoomLevel:function(zoomLevel){return((zoomLevel!=null)&&(zoomLevel>=0)&&(zoomLevel<this.getNumZoomLevels()));},isValidLonLat:function(lonlat){var valid=false;if(lonlat!=null){var maxExtent=this.getMaxExtent();valid=maxExtent.containsLonLat(lonlat);} +return valid;},getProjection:function(){var projection=this.getProjectionObject();return projection?projection.getCode():null;},getProjectionObject:function(){var projection=null;if(this.baseLayer!=null){projection=this.baseLayer.projection;} +return projection;},getMaxResolution:function(){var maxResolution=null;if(this.baseLayer!=null){maxResolution=this.baseLayer.maxResolution;} +return maxResolution;},getMaxExtent:function(options){var maxExtent=null;if(options&&options.restricted&&this.restrictedExtent){maxExtent=this.restrictedExtent;}else if(this.baseLayer!=null){maxExtent=this.baseLayer.maxExtent;} +return maxExtent;},getNumZoomLevels:function(){var numZoomLevels=null;if(this.baseLayer!=null){numZoomLevels=this.baseLayer.numZoomLevels;} +return numZoomLevels;},getExtent:function(){var extent=null;if(this.baseLayer!=null){extent=this.baseLayer.getExtent();} +return extent;},getResolution:function(){var resolution=null;if(this.baseLayer!=null){resolution=this.baseLayer.getResolution();}else if(this.allOverlays===true&&this.layers.length>0){resolution=this.layers[0].getResolution();} +return resolution;},getUnits:function(){var units=null;if(this.baseLayer!=null){units=this.baseLayer.units;} +return units;},getScale:function(){var scale=null;if(this.baseLayer!=null){var res=this.getResolution();var units=this.baseLayer.units;scale=OpenLayers.Util.getScaleFromResolution(res,units);} +return scale;},getZoomForExtent:function(bounds,closest){var zoom=null;if(this.baseLayer!=null){zoom=this.baseLayer.getZoomForExtent(bounds,closest);} +return zoom;},getResolutionForZoom:function(zoom){var resolution=null;if(this.baseLayer){resolution=this.baseLayer.getResolutionForZoom(zoom);} +return resolution;},getZoomForResolution:function(resolution,closest){var zoom=null;if(this.baseLayer!=null){zoom=this.baseLayer.getZoomForResolution(resolution,closest);} +return zoom;},zoomTo:function(zoom){if(this.isValidZoomLevel(zoom)){this.setCenter(null,zoom);}},zoomIn:function(){this.zoomTo(this.getZoom()+1);},zoomOut:function(){this.zoomTo(this.getZoom()-1);},zoomToExtent:function(bounds,closest){var center=bounds.getCenterLonLat();if(this.baseLayer.wrapDateLine){var maxExtent=this.getMaxExtent();bounds=bounds.clone();while(bounds.right<bounds.left){bounds.right+=maxExtent.getWidth();} +center=bounds.getCenterLonLat().wrapDateLine(maxExtent);} +this.setCenter(center,this.getZoomForExtent(bounds,closest));},zoomToMaxExtent:function(options){var restricted=(options)?options.restricted:true;var maxExtent=this.getMaxExtent({'restricted':restricted});this.zoomToExtent(maxExtent);},zoomToScale:function(scale,closest){var res=OpenLayers.Util.getResolutionFromScale(scale,this.baseLayer.units);var size=this.getSize();var w_deg=size.w*res;var h_deg=size.h*res;var center=this.getCachedCenter();var extent=new OpenLayers.Bounds(center.lon-w_deg/2,center.lat-h_deg/2,center.lon+w_deg/2,center.lat+h_deg/2);this.zoomToExtent(extent,closest);},getLonLatFromViewPortPx:function(viewPortPx){var lonlat=null;if(this.baseLayer!=null){lonlat=this.baseLayer.getLonLatFromViewPortPx(viewPortPx);} +return lonlat;},getViewPortPxFromLonLat:function(lonlat){var px=null;if(this.baseLayer!=null){px=this.baseLayer.getViewPortPxFromLonLat(lonlat);} +return px;},getLonLatFromPixel:function(px){return this.getLonLatFromViewPortPx(px);},getPixelFromLonLat:function(lonlat){var px=this.getViewPortPxFromLonLat(lonlat);px.x=Math.round(px.x);px.y=Math.round(px.y);return px;},getGeodesicPixelSize:function(px){var lonlat=px?this.getLonLatFromPixel(px):(this.getCachedCenter()||new OpenLayers.LonLat(0,0));var res=this.getResolution();var left=lonlat.add(-res/2,0);var right=lonlat.add(res/2,0);var bottom=lonlat.add(0,-res/2);var top=lonlat.add(0,res/2);var dest=new OpenLayers.Projection("EPSG:4326");var source=this.getProjectionObject()||dest;if(!source.equals(dest)){left.transform(source,dest);right.transform(source,dest);bottom.transform(source,dest);top.transform(source,dest);} +return new OpenLayers.Size(OpenLayers.Util.distVincenty(left,right),OpenLayers.Util.distVincenty(bottom,top));},getViewPortPxFromLayerPx:function(layerPx){var viewPortPx=null;if(layerPx!=null){var dX=parseInt(this.layerContainerDiv.style.left);var dY=parseInt(this.layerContainerDiv.style.top);viewPortPx=layerPx.add(dX,dY);} +return viewPortPx;},getLayerPxFromViewPortPx:function(viewPortPx){var layerPx=null;if(viewPortPx!=null){var dX=-parseInt(this.layerContainerDiv.style.left);var dY=-parseInt(this.layerContainerDiv.style.top);layerPx=viewPortPx.add(dX,dY);if(isNaN(layerPx.x)||isNaN(layerPx.y)){layerPx=null;}} +return layerPx;},getLonLatFromLayerPx:function(px){px=this.getViewPortPxFromLayerPx(px);return this.getLonLatFromViewPortPx(px);},getLayerPxFromLonLat:function(lonlat){var px=this.getPixelFromLonLat(lonlat);return this.getLayerPxFromViewPortPx(px);},CLASS_NAME:"OpenLayers.Map"});OpenLayers.Map.TILE_WIDTH=256;OpenLayers.Map.TILE_HEIGHT=256;OpenLayers.Layer=OpenLayers.Class({id:null,name:null,div:null,opacity:null,alwaysInRange:null,EVENT_TYPES:["loadstart","loadend","loadcancel","visibilitychanged","move","moveend","added","removed"],RESOLUTION_PROPERTIES:['scales','resolutions','maxScale','minScale','maxResolution','minResolution','numZoomLevels','maxZoomLevel'],events:null,map:null,isBaseLayer:false,alpha:false,displayInLayerSwitcher:true,visibility:true,attribution:null,inRange:false,imageSize:null,imageOffset:null,options:null,eventListeners:null,gutter:0,projection:null,units:null,scales:null,resolutions:null,maxExtent:null,minExtent:null,maxResolution:null,minResolution:null,numZoomLevels:null,minScale:null,maxScale:null,displayOutsideMaxExtent:false,wrapDateLine:false,transitionEffect:null,SUPPORTED_TRANSITIONS:['resize'],metadata:{},initialize:function(name,options){this.addOptions(options);this.name=name;if(this.id==null){this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_");this.div=OpenLayers.Util.createDiv(this.id);this.div.style.width="100%";this.div.style.height="100%";this.div.dir="ltr";this.events=new OpenLayers.Events(this,this.div,this.EVENT_TYPES);if(this.eventListeners instanceof Object){this.events.on(this.eventListeners);}} +if(this.wrapDateLine){this.displayOutsideMaxExtent=true;}},destroy:function(setNewBaseLayer){if(setNewBaseLayer==null){setNewBaseLayer=true;} +if(this.map!=null){this.map.removeLayer(this,setNewBaseLayer);} +this.projection=null;this.map=null;this.name=null;this.div=null;this.options=null;if(this.events){if(this.eventListeners){this.events.un(this.eventListeners);} +this.events.destroy();} +this.eventListeners=null;this.events=null;},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer(this.name,this.getOptions());} +OpenLayers.Util.applyDefaults(obj,this);obj.map=null;return obj;},getOptions:function(){var options={};for(var o in this.options){options[o]=this[o];} +return options;},setName:function(newName){if(newName!=this.name){this.name=newName;if(this.map!=null){this.map.events.triggerEvent("changelayer",{layer:this,property:"name"});}}},addOptions:function(newOptions,reinitialize){if(this.options==null){this.options={};} +OpenLayers.Util.extend(this.options,newOptions);OpenLayers.Util.extend(this,newOptions);if(typeof this.projection=="string"){this.projection=new OpenLayers.Projection(this.projection);} +if(this.projection&&this.projection.getUnits()){this.units=this.projection.getUnits();} +if(this.map){var resolution=this.map.getResolution();var properties=this.RESOLUTION_PROPERTIES.concat(["projection","units","minExtent","maxExtent"]);for(var o in newOptions){if(newOptions.hasOwnProperty(o)&&OpenLayers.Util.indexOf(properties,o)>=0){this.initResolutions();if(reinitialize&&this.map.baseLayer===this){this.map.setCenter(this.map.getCenter(),this.map.getZoomForResolution(resolution),false,true);this.map.events.triggerEvent("changebaselayer",{layer:this});} +break;}}}},onMapResize:function(){},redraw:function(){var redrawn=false;if(this.map){this.inRange=this.calculateInRange();var extent=this.getExtent();if(extent&&this.inRange&&this.visibility){var zoomChanged=true;this.moveTo(extent,zoomChanged,false);this.events.triggerEvent("moveend",{"zoomChanged":zoomChanged});redrawn=true;}} +return redrawn;},moveTo:function(bounds,zoomChanged,dragging){var display=this.visibility;if(!this.isBaseLayer){display=display&&this.inRange;} +this.display(display);},moveByPx:function(dx,dy){},setMap:function(map){if(this.map==null){this.map=map;this.maxExtent=this.maxExtent||this.map.maxExtent;this.minExtent=this.minExtent||this.map.minExtent;this.projection=this.projection||this.map.projection;if(typeof this.projection=="string"){this.projection=new OpenLayers.Projection(this.projection);} +this.units=this.projection.getUnits()||this.units||this.map.units;this.initResolutions();if(!this.isBaseLayer){this.inRange=this.calculateInRange();var show=((this.visibility)&&(this.inRange));this.div.style.display=show?"":"none";} +this.setTileSize();}},afterAdd:function(){},removeMap:function(map){},getImageSize:function(bounds){return(this.imageSize||this.tileSize);},setTileSize:function(size){var tileSize=(size)?size:((this.tileSize)?this.tileSize:this.map.getTileSize());this.tileSize=tileSize;if(this.gutter){this.imageOffset=new OpenLayers.Pixel(-this.gutter,-this.gutter);this.imageSize=new OpenLayers.Size(tileSize.w+(2*this.gutter),tileSize.h+(2*this.gutter));}},getVisibility:function(){return this.visibility;},setVisibility:function(visibility){if(visibility!=this.visibility){this.visibility=visibility;this.display(visibility);this.redraw();if(this.map!=null){this.map.events.triggerEvent("changelayer",{layer:this,property:"visibility"});} +this.events.triggerEvent("visibilitychanged");}},display:function(display){if(display!=(this.div.style.display!="none")){this.div.style.display=(display&&this.calculateInRange())?"block":"none";}},calculateInRange:function(){var inRange=false;if(this.alwaysInRange){inRange=true;}else{if(this.map){var resolution=this.map.getResolution();inRange=((resolution>=this.minResolution)&&(resolution<=this.maxResolution));}} +return inRange;},setIsBaseLayer:function(isBaseLayer){if(isBaseLayer!=this.isBaseLayer){this.isBaseLayer=isBaseLayer;if(this.map!=null){this.map.events.triggerEvent("changebaselayer",{layer:this});}}},initResolutions:function(){var i,len,p;var props={},alwaysInRange=true;for(i=0,len=this.RESOLUTION_PROPERTIES.length;i<len;i++){p=this.RESOLUTION_PROPERTIES[i];props[p]=this.options[p];if(alwaysInRange&&this.options[p]){alwaysInRange=false;}} +if(this.alwaysInRange==null){this.alwaysInRange=alwaysInRange;} +if(props.resolutions==null){props.resolutions=this.resolutionsFromScales(props.scales);} +if(props.resolutions==null){props.resolutions=this.calculateResolutions(props);} +if(props.resolutions==null){for(i=0,len=this.RESOLUTION_PROPERTIES.length;i<len;i++){p=this.RESOLUTION_PROPERTIES[i];props[p]=this.options[p]!=null?this.options[p]:this.map[p];} +if(props.resolutions==null){props.resolutions=this.resolutionsFromScales(props.scales);} +if(props.resolutions==null){props.resolutions=this.calculateResolutions(props);}} +var maxResolution;if(this.options.maxResolution&&this.options.maxResolution!=="auto"){maxResolution=this.options.maxResolution;} +if(this.options.minScale){maxResolution=OpenLayers.Util.getResolutionFromScale(this.options.minScale,this.units);} +var minResolution;if(this.options.minResolution&&this.options.minResolution!=="auto"){minResolution=this.options.minResolution;} +if(this.options.maxScale){minResolution=OpenLayers.Util.getResolutionFromScale(this.options.maxScale,this.units);} +if(props.resolutions){props.resolutions.sort(function(a,b){return(b-a);});if(!maxResolution){maxResolution=props.resolutions[0];} +if(!minResolution){var lastIdx=props.resolutions.length-1;minResolution=props.resolutions[lastIdx];}} +this.resolutions=props.resolutions;if(this.resolutions){len=this.resolutions.length;this.scales=new Array(len);for(i=0;i<len;i++){this.scales[i]=OpenLayers.Util.getScaleFromResolution(this.resolutions[i],this.units);} +this.numZoomLevels=len;} +this.minResolution=minResolution;if(minResolution){this.maxScale=OpenLayers.Util.getScaleFromResolution(minResolution,this.units);} +this.maxResolution=maxResolution;if(maxResolution){this.minScale=OpenLayers.Util.getScaleFromResolution(maxResolution,this.units);}},resolutionsFromScales:function(scales){if(scales==null){return;} +var resolutions,i,len;len=scales.length;resolutions=new Array(len);for(i=0;i<len;i++){resolutions[i]=OpenLayers.Util.getResolutionFromScale(scales[i],this.units);} +return resolutions;},calculateResolutions:function(props){var viewSize,wRes,hRes;var maxResolution=props.maxResolution;if(props.minScale!=null){maxResolution=OpenLayers.Util.getResolutionFromScale(props.minScale,this.units);}else if(maxResolution=="auto"&&this.maxExtent!=null){viewSize=this.map.getSize();wRes=this.maxExtent.getWidth()/viewSize.w;hRes=this.maxExtent.getHeight()/viewSize.h;maxResolution=Math.max(wRes,hRes);} +var minResolution=props.minResolution;if(props.maxScale!=null){minResolution=OpenLayers.Util.getResolutionFromScale(props.maxScale,this.units);}else if(props.minResolution=="auto"&&this.minExtent!=null){viewSize=this.map.getSize();wRes=this.minExtent.getWidth()/viewSize.w;hRes=this.minExtent.getHeight()/viewSize.h;minResolution=Math.max(wRes,hRes);} +var maxZoomLevel=props.maxZoomLevel;var numZoomLevels=props.numZoomLevels;if(typeof minResolution==="number"&&typeof maxResolution==="number"&&numZoomLevels===undefined){var ratio=maxResolution/minResolution;numZoomLevels=Math.floor(Math.log(ratio)/Math.log(2))+1;}else if(numZoomLevels===undefined&&maxZoomLevel!=null){numZoomLevels=maxZoomLevel+1;} +if(typeof numZoomLevels!=="number"||numZoomLevels<=0||(typeof maxResolution!=="number"&&typeof minResolution!=="number")){return;} +var resolutions=new Array(numZoomLevels);var base=2;if(typeof minResolution=="number"&&typeof maxResolution=="number"){base=Math.pow((maxResolution/minResolution),(1/(numZoomLevels-1)));} +var i;if(typeof maxResolution==="number"){for(i=0;i<numZoomLevels;i++){resolutions[i]=maxResolution/Math.pow(base,i);}}else{for(i=0;i<numZoomLevels;i++){resolutions[numZoomLevels-1-i]=minResolution*Math.pow(base,i);}} +return resolutions;},getResolution:function(){var zoom=this.map.getZoom();return this.getResolutionForZoom(zoom);},getExtent:function(){return this.map.calculateBounds();},getZoomForExtent:function(extent,closest){var viewSize=this.map.getSize();var idealResolution=Math.max(extent.getWidth()/viewSize.w,extent.getHeight()/viewSize.h);return this.getZoomForResolution(idealResolution,closest);},getDataExtent:function(){},getResolutionForZoom:function(zoom){zoom=Math.max(0,Math.min(zoom,this.resolutions.length-1));var resolution;if(this.map.fractionalZoom){var low=Math.floor(zoom);var high=Math.ceil(zoom);resolution=this.resolutions[low]- +((zoom-low)*(this.resolutions[low]-this.resolutions[high]));}else{resolution=this.resolutions[Math.round(zoom)];} +return resolution;},getZoomForResolution:function(resolution,closest){var zoom,i,len;if(this.map.fractionalZoom){var lowZoom=0;var highZoom=this.resolutions.length-1;var highRes=this.resolutions[lowZoom];var lowRes=this.resolutions[highZoom];var res;for(i=0,len=this.resolutions.length;i<len;++i){res=this.resolutions[i];if(res>=resolution){highRes=res;lowZoom=i;} +if(res<=resolution){lowRes=res;highZoom=i;break;}} +var dRes=highRes-lowRes;if(dRes>0){zoom=lowZoom+((highRes-resolution)/dRes);}else{zoom=lowZoom;}}else{var diff;var minDiff=Number.POSITIVE_INFINITY;for(i=0,len=this.resolutions.length;i<len;i++){if(closest){diff=Math.abs(this.resolutions[i]-resolution);if(diff>minDiff){break;} +minDiff=diff;}else{if(this.resolutions[i]<resolution){break;}}} +zoom=Math.max(0,i-1);} +return zoom;},getLonLatFromViewPortPx:function(viewPortPx){var lonlat=null;var map=this.map;if(viewPortPx!=null&&map.minPx){var res=map.getResolution();var maxExtent=map.getMaxExtent({restricted:true});var lon=(viewPortPx.x-map.minPx.x)*res+maxExtent.left;var lat=(map.minPx.y-viewPortPx.y)*res+maxExtent.top;lonlat=new OpenLayers.LonLat(lon,lat);if(this.wrapDateLine){lonlat=lonlat.wrapDateLine(this.maxExtent);}} +return lonlat;},getViewPortPxFromLonLat:function(lonlat){var px=null;if(lonlat!=null){var resolution=this.map.getResolution();var extent=this.map.getExtent();px=new OpenLayers.Pixel((1/resolution*(lonlat.lon-extent.left)),(1/resolution*(extent.top-lonlat.lat)));} +return px;},setOpacity:function(opacity){if(opacity!=this.opacity){this.opacity=opacity;for(var i=0,len=this.div.childNodes.length;i<len;++i){var element=this.div.childNodes[i].firstChild;OpenLayers.Util.modifyDOMElement(element,null,null,null,null,null,null,opacity);} +if(this.map!=null){this.map.events.triggerEvent("changelayer",{layer:this,property:"opacity"});}}},getZIndex:function(){return this.div.style.zIndex;},setZIndex:function(zIndex){this.div.style.zIndex=zIndex;},adjustBounds:function(bounds){if(this.gutter){var mapGutter=this.gutter*this.map.getResolution();bounds=new OpenLayers.Bounds(bounds.left-mapGutter,bounds.bottom-mapGutter,bounds.right+mapGutter,bounds.top+mapGutter);} +if(this.wrapDateLine){var wrappingOptions={'rightTolerance':this.getResolution(),'leftTolerance':this.getResolution()};bounds=bounds.wrapDateLine(this.maxExtent,wrappingOptions);} +return bounds;},CLASS_NAME:"OpenLayers.Layer"});OpenLayers.StyleMap=OpenLayers.Class({styles:null,extendDefault:true,initialize:function(style,options){this.styles={"default":new OpenLayers.Style(OpenLayers.Feature.Vector.style["default"]),"select":new OpenLayers.Style(OpenLayers.Feature.Vector.style["select"]),"temporary":new OpenLayers.Style(OpenLayers.Feature.Vector.style["temporary"]),"delete":new OpenLayers.Style(OpenLayers.Feature.Vector.style["delete"])};if(style instanceof OpenLayers.Style){this.styles["default"]=style;this.styles["select"]=style;this.styles["temporary"]=style;this.styles["delete"]=style;}else if(typeof style=="object"){for(var key in style){if(style[key]instanceof OpenLayers.Style){this.styles[key]=style[key];}else if(typeof style[key]=="object"){this.styles[key]=new OpenLayers.Style(style[key]);}else{this.styles["default"]=new OpenLayers.Style(style);this.styles["select"]=new OpenLayers.Style(style);this.styles["temporary"]=new OpenLayers.Style(style);this.styles["delete"]=new OpenLayers.Style(style);break;}}} +OpenLayers.Util.extend(this,options);},destroy:function(){for(var key in this.styles){this.styles[key].destroy();} +this.styles=null;},createSymbolizer:function(feature,intent){if(!feature){feature=new OpenLayers.Feature.Vector();} +if(!this.styles[intent]){intent="default";} +feature.renderIntent=intent;var defaultSymbolizer={};if(this.extendDefault&&intent!="default"){defaultSymbolizer=this.styles["default"].createSymbolizer(feature);} +return OpenLayers.Util.extend(defaultSymbolizer,this.styles[intent].createSymbolizer(feature));},addUniqueValueRules:function(renderIntent,property,symbolizers,context){var rules=[];for(var value in symbolizers){rules.push(new OpenLayers.Rule({symbolizer:symbolizers[value],context:context,filter:new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.EQUAL_TO,property:property,value:value})}));} +this.styles[renderIntent].addRules(rules);},CLASS_NAME:"OpenLayers.StyleMap"});OpenLayers.Layer.Vector=OpenLayers.Class(OpenLayers.Layer,{EVENT_TYPES:["beforefeatureadded","beforefeaturesadded","featureadded","featuresadded","beforefeatureremoved","beforefeaturesremoved","featureremoved","featuresremoved","beforefeatureselected","featureselected","featureunselected","beforefeaturemodified","featuremodified","afterfeaturemodified","vertexmodified","vertexremoved","sketchstarted","sketchmodified","sketchcomplete","refresh"],isBaseLayer:false,isFixed:false,features:null,filter:null,selectedFeatures:null,unrenderedFeatures:null,reportError:true,style:null,styleMap:null,strategies:null,protocol:null,renderers:['SVG','VML','Canvas'],renderer:null,rendererOptions:null,geometryType:null,drawn:false,initialize:function(name,options){this.EVENT_TYPES=OpenLayers.Layer.Vector.prototype.EVENT_TYPES.concat(OpenLayers.Layer.prototype.EVENT_TYPES);OpenLayers.Layer.prototype.initialize.apply(this,arguments);if(!this.renderer||!this.renderer.supported()){this.assignRenderer();} +if(!this.renderer||!this.renderer.supported()){this.renderer=null;this.displayError();} +if(!this.styleMap){this.styleMap=new OpenLayers.StyleMap();} +this.features=[];this.selectedFeatures=[];this.unrenderedFeatures={};if(this.strategies){for(var i=0,len=this.strategies.length;i<len;i++){this.strategies[i].setLayer(this);}}},destroy:function(){if(this.strategies){var strategy,i,len;for(i=0,len=this.strategies.length;i<len;i++){strategy=this.strategies[i];if(strategy.autoDestroy){strategy.destroy();}} +this.strategies=null;} +if(this.protocol){if(this.protocol.autoDestroy){this.protocol.destroy();} +this.protocol=null;} +this.destroyFeatures();this.features=null;this.selectedFeatures=null;this.unrenderedFeatures=null;if(this.renderer){this.renderer.destroy();} +this.renderer=null;this.geometryType=null;this.drawn=null;OpenLayers.Layer.prototype.destroy.apply(this,arguments);},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.Vector(this.name,this.getOptions());} +obj=OpenLayers.Layer.prototype.clone.apply(this,[obj]);var features=this.features;var len=features.length;var clonedFeatures=new Array(len);for(var i=0;i<len;++i){clonedFeatures[i]=features[i].clone();} +obj.features=clonedFeatures;return obj;},refresh:function(obj){if(this.calculateInRange()&&this.visibility){this.events.triggerEvent("refresh",obj);}},assignRenderer:function(){for(var i=0,len=this.renderers.length;i<len;i++){var rendererClass=this.renderers[i];var renderer=(typeof rendererClass=="function")?rendererClass:OpenLayers.Renderer[rendererClass];if(renderer&&renderer.prototype.supported()){this.renderer=new renderer(this.div,this.rendererOptions);break;}}},displayError:function(){if(this.reportError){OpenLayers.Console.userError(OpenLayers.i18n("browserNotSupported",{'renderers':this.renderers.join("\n")}));}},setMap:function(map){OpenLayers.Layer.prototype.setMap.apply(this,arguments);if(!this.renderer){this.map.removeLayer(this);}else{this.renderer.map=this.map;this.renderer.setSize(this.map.getSize());}},afterAdd:function(){if(this.strategies){var strategy,i,len;for(i=0,len=this.strategies.length;i<len;i++){strategy=this.strategies[i];if(strategy.autoActivate){strategy.activate();}}}},removeMap:function(map){this.drawn=false;if(this.strategies){var strategy,i,len;for(i=0,len=this.strategies.length;i<len;i++){strategy=this.strategies[i];if(strategy.autoActivate){strategy.deactivate();}}}},onMapResize:function(){OpenLayers.Layer.prototype.onMapResize.apply(this,arguments);this.renderer.setSize(this.map.getSize());},moveTo:function(bounds,zoomChanged,dragging){OpenLayers.Layer.prototype.moveTo.apply(this,arguments);var ng=(OpenLayers.Renderer.NG&&this.renderer instanceof OpenLayers.Renderer.NG);if(ng){dragging||this.renderer.updateDimensions(zoomChanged);}else{var coordSysUnchanged=true;if(!dragging){this.renderer.root.style.visibility="hidden";this.div.style.left=-parseInt(this.map.layerContainerDiv.style.left)+"px";this.div.style.top=-parseInt(this.map.layerContainerDiv.style.top)+"px";var extent=this.map.getExtent();coordSysUnchanged=this.renderer.setExtent(extent,zoomChanged);this.renderer.root.style.visibility="visible";if(OpenLayers.IS_GECKO===true){this.div.scrollLeft=this.div.scrollLeft;} +if(!zoomChanged&&coordSysUnchanged){for(var i in this.unrenderedFeatures){var feature=this.unrenderedFeatures[i];this.drawFeature(feature);}}}} +if(!this.drawn||(!ng&&(zoomChanged||!coordSysUnchanged))){this.drawn=true;var feature;for(var i=0,len=this.features.length;i<len;i++){this.renderer.locked=(i!==(len-1));feature=this.features[i];this.drawFeature(feature);}}},redraw:function(){if(OpenLayers.Renderer.NG&&this.renderer instanceof OpenLayers.Renderer.NG){this.drawn=false;} +return OpenLayers.Layer.prototype.redraw.apply(this,arguments);},display:function(display){OpenLayers.Layer.prototype.display.apply(this,arguments);var currentDisplay=this.div.style.display;if(currentDisplay!=this.renderer.root.style.display){this.renderer.root.style.display=currentDisplay;}},addFeatures:function(features,options){if(!(OpenLayers.Util.isArray(features))){features=[features];} +var notify=!options||!options.silent;if(notify){var event={features:features};var ret=this.events.triggerEvent("beforefeaturesadded",event);if(ret===false){return;} +features=event.features;} +var featuresAdded=[];for(var i=0,len=features.length;i<len;i++){if(i!=(features.length-1)){this.renderer.locked=true;}else{this.renderer.locked=false;} +var feature=features[i];if(this.geometryType&&!(feature.geometry instanceof this.geometryType)){var throwStr=OpenLayers.i18n('componentShouldBe',{'geomType':this.geometryType.prototype.CLASS_NAME});throw throwStr;} +feature.layer=this;if(!feature.style&&this.style){feature.style=OpenLayers.Util.extend({},this.style);} +if(notify){if(this.events.triggerEvent("beforefeatureadded",{feature:feature})===false){continue;} +this.preFeatureInsert(feature);} +featuresAdded.push(feature);this.features.push(feature);this.drawFeature(feature);if(notify){this.events.triggerEvent("featureadded",{feature:feature});this.onFeatureInsert(feature);}} +if(notify){this.events.triggerEvent("featuresadded",{features:featuresAdded});}},removeFeatures:function(features,options){if(!features||features.length===0){return;} +if(features===this.features){return this.removeAllFeatures(options);} +if(!(OpenLayers.Util.isArray(features))){features=[features];} +if(features===this.selectedFeatures){features=features.slice();} +var notify=!options||!options.silent;if(notify){this.events.triggerEvent("beforefeaturesremoved",{features:features});} +for(var i=features.length-1;i>=0;i--){if(i!=0&&features[i-1].geometry){this.renderer.locked=true;}else{this.renderer.locked=false;} +var feature=features[i];delete this.unrenderedFeatures[feature.id];if(notify){this.events.triggerEvent("beforefeatureremoved",{feature:feature});} +this.features=OpenLayers.Util.removeItem(this.features,feature);feature.layer=null;if(feature.geometry){this.renderer.eraseFeatures(feature);} +if(OpenLayers.Util.indexOf(this.selectedFeatures,feature)!=-1){OpenLayers.Util.removeItem(this.selectedFeatures,feature);} +if(notify){this.events.triggerEvent("featureremoved",{feature:feature});}} +if(notify){this.events.triggerEvent("featuresremoved",{features:features});}},removeAllFeatures:function(options){var notify=!options||!options.silent;var features=this.features;if(notify){this.events.triggerEvent("beforefeaturesremoved",{features:features});} +var feature;for(var i=features.length-1;i>=0;i--){feature=features[i];if(notify){this.events.triggerEvent("beforefeatureremoved",{feature:feature});} +feature.layer=null;if(notify){this.events.triggerEvent("featureremoved",{feature:feature});}} +this.renderer.clear();this.features=[];this.unrenderedFeatures={};this.selectedFeatures=[];if(notify){this.events.triggerEvent("featuresremoved",{features:features});}},destroyFeatures:function(features,options){var all=(features==undefined);if(all){features=this.features;} +if(features){this.removeFeatures(features,options);for(var i=features.length-1;i>=0;i--){features[i].destroy();}}},drawFeature:function(feature,style){if(!this.drawn){return;} +if(typeof style!="object"){if(!style&&feature.state===OpenLayers.State.DELETE){style="delete";} +var renderIntent=style||feature.renderIntent;style=feature.style||this.style;if(!style){style=this.styleMap.createSymbolizer(feature,renderIntent);}} +var drawn=this.renderer.drawFeature(feature,style);if(drawn===false||drawn===null){this.unrenderedFeatures[feature.id]=feature;}else{delete this.unrenderedFeatures[feature.id];}},eraseFeatures:function(features){this.renderer.eraseFeatures(features);},getFeatureFromEvent:function(evt){if(!this.renderer){OpenLayers.Console.error(OpenLayers.i18n("getFeatureError"));return null;} +var feature=null;var featureId=this.renderer.getFeatureIdFromEvent(evt);if(featureId){if(typeof featureId==="string"){feature=this.getFeatureById(featureId);}else{feature=featureId;}} +return feature;},getFeatureBy:function(property,value){var feature=null;for(var i=0,len=this.features.length;i<len;++i){if(this.features[i][property]==value){feature=this.features[i];break;}} +return feature;},getFeatureById:function(featureId){return this.getFeatureBy('id',featureId);},getFeatureByFid:function(featureFid){return this.getFeatureBy('fid',featureFid);},getFeaturesByAttribute:function(attrName,attrValue){var i,feature,len=this.features.length,foundFeatures=[];for(i=0;i<len;i++){feature=this.features[i];if(feature&&feature.attributes){if(feature.attributes[attrName]===attrValue){foundFeatures.push(feature);}}} +return foundFeatures;},onFeatureInsert:function(feature){},preFeatureInsert:function(feature){},getDataExtent:function(){var maxExtent=null;var features=this.features;if(features&&(features.length>0)){var geometry=null;for(var i=0,len=features.length;i<len;i++){geometry=features[i].geometry;if(geometry){if(maxExtent===null){maxExtent=new OpenLayers.Bounds();} +maxExtent.extend(geometry.getBounds());}}} +return maxExtent;},CLASS_NAME:"OpenLayers.Layer.Vector"});OpenLayers.Layer.Vector.RootContainer=OpenLayers.Class(OpenLayers.Layer.Vector,{displayInLayerSwitcher:false,layers:null,initialize:function(name,options){OpenLayers.Layer.Vector.prototype.initialize.apply(this,arguments);},display:function(){},getFeatureFromEvent:function(evt){var layers=this.layers;var feature;for(var i=0;i<layers.length;i++){feature=layers[i].getFeatureFromEvent(evt);if(feature){return feature;}}},setMap:function(map){OpenLayers.Layer.Vector.prototype.setMap.apply(this,arguments);this.collectRoots();map.events.register("changelayer",this,this.handleChangeLayer);},removeMap:function(map){map.events.unregister("changelayer",this,this.handleChangeLayer);this.resetRoots();OpenLayers.Layer.Vector.prototype.removeMap.apply(this,arguments);},collectRoots:function(){var layer;for(var i=0;i<this.map.layers.length;++i){layer=this.map.layers[i];if(OpenLayers.Util.indexOf(this.layers,layer)!=-1){layer.renderer.moveRoot(this.renderer);}}},resetRoots:function(){var layer;for(var i=0;i<this.layers.length;++i){layer=this.layers[i];if(this.renderer&&layer.renderer.getRenderLayerId()==this.id){this.renderer.moveRoot(layer.renderer);}}},handleChangeLayer:function(evt){var layer=evt.layer;if(evt.property=="order"&&OpenLayers.Util.indexOf(this.layers,layer)!=-1){this.resetRoots();this.collectRoots();}},CLASS_NAME:"OpenLayers.Layer.Vector.RootContainer"});OpenLayers.Control.SelectFeature=OpenLayers.Class(OpenLayers.Control,{EVENT_TYPES:["beforefeaturehighlighted","featurehighlighted","featureunhighlighted"],multipleKey:null,toggleKey:null,multiple:false,clickout:true,toggle:false,hover:false,highlightOnly:false,box:false,onBeforeSelect:function(){},onSelect:function(){},onUnselect:function(){},scope:null,geometryTypes:null,layer:null,layers:null,callbacks:null,selectStyle:null,renderIntent:"select",handlers:null,initialize:function(layers,options){this.EVENT_TYPES=OpenLayers.Control.SelectFeature.prototype.EVENT_TYPES.concat(OpenLayers.Control.prototype.EVENT_TYPES);OpenLayers.Control.prototype.initialize.apply(this,[options]);if(this.scope===null){this.scope=this;} +this.initLayer(layers);var callbacks={click:this.clickFeature,clickout:this.clickoutFeature};if(this.hover){callbacks.over=this.overFeature;callbacks.out=this.outFeature;} +this.callbacks=OpenLayers.Util.extend(callbacks,this.callbacks);this.handlers={feature:new OpenLayers.Handler.Feature(this,this.layer,this.callbacks,{geometryTypes:this.geometryTypes})};if(this.box){this.handlers.box=new OpenLayers.Handler.Box(this,{done:this.selectBox},{boxDivClassName:"olHandlerBoxSelectFeature"});}},initLayer:function(layers){if(OpenLayers.Util.isArray(layers)){this.layers=layers;this.layer=new OpenLayers.Layer.Vector.RootContainer(this.id+"_container",{layers:layers});}else{this.layer=layers;}},destroy:function(){if(this.active&&this.layers){this.map.removeLayer(this.layer);} +OpenLayers.Control.prototype.destroy.apply(this,arguments);if(this.layers){this.layer.destroy();}},activate:function(){if(!this.active){if(this.layers){this.map.addLayer(this.layer);} +this.handlers.feature.activate();if(this.box&&this.handlers.box){this.handlers.box.activate();}} +return OpenLayers.Control.prototype.activate.apply(this,arguments);},deactivate:function(){if(this.active){this.handlers.feature.deactivate();if(this.handlers.box){this.handlers.box.deactivate();} +if(this.layers){this.map.removeLayer(this.layer);}} +return OpenLayers.Control.prototype.deactivate.apply(this,arguments);},unselectAll:function(options){var layers=this.layers||[this.layer];var layer,feature;for(var l=0;l<layers.length;++l){layer=layers[l];for(var i=layer.selectedFeatures.length-1;i>=0;--i){feature=layer.selectedFeatures[i];if(!options||options.except!=feature){this.unselect(feature);}}}},clickFeature:function(feature){if(!this.hover){var selected=(OpenLayers.Util.indexOf(feature.layer.selectedFeatures,feature)>-1);if(selected){if(this.toggleSelect()){this.unselect(feature);}else if(!this.multipleSelect()){this.unselectAll({except:feature});}}else{if(!this.multipleSelect()){this.unselectAll({except:feature});} +this.select(feature);}}},multipleSelect:function(){return this.multiple||(this.handlers.feature.evt&&this.handlers.feature.evt[this.multipleKey]);},toggleSelect:function(){return this.toggle||(this.handlers.feature.evt&&this.handlers.feature.evt[this.toggleKey]);},clickoutFeature:function(feature){if(!this.hover&&this.clickout){this.unselectAll();}},overFeature:function(feature){var layer=feature.layer;if(this.hover){if(this.highlightOnly){this.highlight(feature);}else if(OpenLayers.Util.indexOf(layer.selectedFeatures,feature)==-1){this.select(feature);}}},outFeature:function(feature){if(this.hover){if(this.highlightOnly){if(feature._lastHighlighter==this.id){if(feature._prevHighlighter&&feature._prevHighlighter!=this.id){delete feature._lastHighlighter;var control=this.map.getControl(feature._prevHighlighter);if(control){control.highlight(feature);}}else{this.unhighlight(feature);}}}else{this.unselect(feature);}}},highlight:function(feature){var layer=feature.layer;var cont=this.events.triggerEvent("beforefeaturehighlighted",{feature:feature});if(cont!==false){feature._prevHighlighter=feature._lastHighlighter;feature._lastHighlighter=this.id;var style=this.selectStyle||this.renderIntent;layer.drawFeature(feature,style);this.events.triggerEvent("featurehighlighted",{feature:feature});}},unhighlight:function(feature){var layer=feature.layer;if(feature._prevHighlighter==undefined){delete feature._lastHighlighter;}else if(feature._prevHighlighter==this.id){delete feature._prevHighlighter;}else{feature._lastHighlighter=feature._prevHighlighter;delete feature._prevHighlighter;} +layer.drawFeature(feature,feature.style||feature.layer.style||"default");this.events.triggerEvent("featureunhighlighted",{feature:feature});},select:function(feature){var cont=this.onBeforeSelect.call(this.scope,feature);var layer=feature.layer;if(cont!==false){cont=layer.events.triggerEvent("beforefeatureselected",{feature:feature});if(cont!==false){layer.selectedFeatures.push(feature);this.highlight(feature);if(!this.handlers.feature.lastFeature){this.handlers.feature.lastFeature=layer.selectedFeatures[0];} +layer.events.triggerEvent("featureselected",{feature:feature});this.onSelect.call(this.scope,feature);}}},unselect:function(feature){var layer=feature.layer;this.unhighlight(feature);OpenLayers.Util.removeItem(layer.selectedFeatures,feature);layer.events.triggerEvent("featureunselected",{feature:feature});this.onUnselect.call(this.scope,feature);},selectBox:function(position){if(position instanceof OpenLayers.Bounds){var minXY=this.map.getLonLatFromPixel(new OpenLayers.Pixel(position.left,position.bottom));var maxXY=this.map.getLonLatFromPixel(new OpenLayers.Pixel(position.right,position.top));var bounds=new OpenLayers.Bounds(minXY.lon,minXY.lat,maxXY.lon,maxXY.lat);if(!this.multipleSelect()){this.unselectAll();} +var prevMultiple=this.multiple;this.multiple=true;var layers=this.layers||[this.layer];var layer;for(var l=0;l<layers.length;++l){layer=layers[l];for(var i=0,len=layer.features.length;i<len;++i){var feature=layer.features[i];if(!feature.getVisibility()){continue;} +if(this.geometryTypes==null||OpenLayers.Util.indexOf(this.geometryTypes,feature.geometry.CLASS_NAME)>-1){if(bounds.toGeometry().intersects(feature.geometry)){if(OpenLayers.Util.indexOf(layer.selectedFeatures,feature)==-1){this.select(feature);}}}}} +this.multiple=prevMultiple;}},setMap:function(map){this.handlers.feature.setMap(map);if(this.box){this.handlers.box.setMap(map);} +OpenLayers.Control.prototype.setMap.apply(this,arguments);},setLayer:function(layers){var isActive=this.active;this.unselectAll();this.deactivate();if(this.layers){this.layer.destroy();this.layers=null;} +this.initLayer(layers);this.handlers.feature.layer=this.layer;if(isActive){this.activate();}},CLASS_NAME:"OpenLayers.Control.SelectFeature"});OpenLayers.Format.OGCExceptionReport=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{ogc:"http://www.opengis.net/ogc"},regExes:{trimSpace:(/^\s*|\s*$/g),removeSpace:(/\s*/g),splitSpace:(/\s+/),trimComma:(/\s*,\s*/g)},defaultPrefix:"ogc",read:function(data){var result;if(typeof data=="string"){data=OpenLayers.Format.XML.prototype.read.apply(this,[data]);} +var root=data.documentElement;var exceptionInfo={exceptionReport:null};if(root){this.readChildNodes(data,exceptionInfo);if(exceptionInfo.exceptionReport===null){exceptionInfo=new OpenLayers.Format.OWSCommon().read(data);}} +return exceptionInfo;},readers:{"ogc":{"ServiceExceptionReport":function(node,obj){obj.exceptionReport={exceptions:[]};this.readChildNodes(node,obj.exceptionReport);},"ServiceException":function(node,exceptionReport){var exception={code:node.getAttribute("code"),locator:node.getAttribute("locator"),text:this.getChildValue(node)};exceptionReport.exceptions.push(exception);}}},CLASS_NAME:"OpenLayers.Format.OGCExceptionReport"});OpenLayers.Format.XML.VersionedOGC=OpenLayers.Class(OpenLayers.Format.XML,{defaultVersion:null,version:null,profile:null,errorProperty:null,name:null,stringifyOutput:false,parser:null,initialize:function(options){OpenLayers.Format.XML.prototype.initialize.apply(this,[options]);var className=this.CLASS_NAME;this.name=className.substring(className.lastIndexOf(".")+1);},getVersion:function(root,options){var version;if(root){version=this.version;if(!version){version=root.getAttribute("version");if(!version){version=this.defaultVersion;}}}else{version=(options&&options.version)||this.version||this.defaultVersion;} +return version;},getParser:function(version){version=version||this.defaultVersion;var profile=this.profile?"_"+this.profile:"";if(!this.parser||this.parser.VERSION!=version){var format=OpenLayers.Format[this.name]["v"+version.replace(/\./g,"_")+profile];if(!format){throw"Can't find a "+this.name+" parser for version "+ +version+profile;} +this.parser=new format(this.options);} +return this.parser;},write:function(obj,options){var version=this.getVersion(null,options);this.parser=this.getParser(version);var root=this.parser.write(obj,options);if(this.stringifyOutput===false){return root;}else{return OpenLayers.Format.XML.prototype.write.apply(this,[root]);}},read:function(data,options){if(typeof data=="string"){data=OpenLayers.Format.XML.prototype.read.apply(this,[data]);} +var root=data.documentElement;var version=this.getVersion(root);this.parser=this.getParser(version);var obj=this.parser.read(data,options);if(this.errorProperty!==null&&obj[this.errorProperty]===undefined){var format=new OpenLayers.Format.OGCExceptionReport();obj.error=format.read(data);} +obj.version=version;return obj;},CLASS_NAME:"OpenLayers.Format.XML.VersionedOGC"});OpenLayers.Format.OWSCommon=OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC,{defaultVersion:"1.0.0",getVersion:function(root,options){var version=this.version;if(!version){var uri=root.getAttribute("xmlns:ows");if(uri&&uri.substring(uri.lastIndexOf("/")+1)==="1.1"){version="1.1.0";} +if(!version){version=this.defaultVersion;}} +return version;},CLASS_NAME:"OpenLayers.Format.OWSCommon"});OpenLayers.Format.OWSCommon.v1=OpenLayers.Class(OpenLayers.Format.XML,{regExes:{trimSpace:(/^\s*|\s*$/g),removeSpace:(/\s*/g),splitSpace:(/\s+/),trimComma:(/\s*,\s*/g)},read:function(data,options){options=OpenLayers.Util.applyDefaults(options,this.options);var ows={};this.readChildNodes(data,ows);return ows;},readers:{"ows":{"Exception":function(node,exceptionReport){var exception={code:node.getAttribute('exceptionCode'),locator:node.getAttribute('locator'),texts:[]};exceptionReport.exceptions.push(exception);this.readChildNodes(node,exception);},"ExceptionText":function(node,exception){var text=this.getChildValue(node);exception.texts.push(text);},"ServiceIdentification":function(node,obj){obj.serviceIdentification={};this.readChildNodes(node,obj.serviceIdentification);},"Title":function(node,obj){obj.title=this.getChildValue(node);},"Abstract":function(node,serviceIdentification){serviceIdentification["abstract"]=this.getChildValue(node);},"Keywords":function(node,serviceIdentification){serviceIdentification.keywords={};this.readChildNodes(node,serviceIdentification.keywords);},"Keyword":function(node,keywords){keywords[this.getChildValue(node)]=true;},"ServiceType":function(node,serviceIdentification){serviceIdentification.serviceType={codeSpace:node.getAttribute('codeSpace'),value:this.getChildValue(node)};},"ServiceTypeVersion":function(node,serviceIdentification){serviceIdentification.serviceTypeVersion=this.getChildValue(node);},"Fees":function(node,serviceIdentification){serviceIdentification.fees=this.getChildValue(node);},"AccessConstraints":function(node,serviceIdentification){serviceIdentification.accessConstraints=this.getChildValue(node);},"ServiceProvider":function(node,obj){obj.serviceProvider={};this.readChildNodes(node,obj.serviceProvider);},"ProviderName":function(node,serviceProvider){serviceProvider.providerName=this.getChildValue(node);},"ProviderSite":function(node,serviceProvider){serviceProvider.providerSite=this.getAttributeNS(node,this.namespaces.xlink,"href");},"ServiceContact":function(node,serviceProvider){serviceProvider.serviceContact={};this.readChildNodes(node,serviceProvider.serviceContact);},"IndividualName":function(node,serviceContact){serviceContact.individualName=this.getChildValue(node);},"PositionName":function(node,serviceContact){serviceContact.positionName=this.getChildValue(node);},"ContactInfo":function(node,serviceContact){serviceContact.contactInfo={};this.readChildNodes(node,serviceContact.contactInfo);},"Phone":function(node,contactInfo){contactInfo.phone={};this.readChildNodes(node,contactInfo.phone);},"Voice":function(node,phone){phone.voice=this.getChildValue(node);},"Address":function(node,contactInfo){contactInfo.address={};this.readChildNodes(node,contactInfo.address);},"DeliveryPoint":function(node,address){address.deliveryPoint=this.getChildValue(node);},"City":function(node,address){address.city=this.getChildValue(node);},"AdministrativeArea":function(node,address){address.administrativeArea=this.getChildValue(node);},"PostalCode":function(node,address){address.postalCode=this.getChildValue(node);},"Country":function(node,address){address.country=this.getChildValue(node);},"ElectronicMailAddress":function(node,address){address.electronicMailAddress=this.getChildValue(node);},"Role":function(node,serviceContact){serviceContact.role=this.getChildValue(node);},"OperationsMetadata":function(node,obj){obj.operationsMetadata={};this.readChildNodes(node,obj.operationsMetadata);},"Operation":function(node,operationsMetadata){var name=node.getAttribute("name");operationsMetadata[name]={};this.readChildNodes(node,operationsMetadata[name]);},"DCP":function(node,operation){operation.dcp={};this.readChildNodes(node,operation.dcp);},"HTTP":function(node,dcp){dcp.http={};this.readChildNodes(node,dcp.http);},"Get":function(node,http){http.get=this.getAttributeNS(node,this.namespaces.xlink,"href");},"Post":function(node,http){http.post=this.getAttributeNS(node,this.namespaces.xlink,"href");},"Parameter":function(node,operation){if(!operation.parameters){operation.parameters={};} +var name=node.getAttribute("name");operation.parameters[name]={};this.readChildNodes(node,operation.parameters[name]);},"Value":function(node,allowedValues){allowedValues[this.getChildValue(node)]=true;},"OutputFormat":function(node,obj){obj.formats.push({value:this.getChildValue(node)});this.readChildNodes(node,obj);},"WGS84BoundingBox":function(node,obj){var boundingBox={};boundingBox.crs=node.getAttribute("crs");if(obj.BoundingBox){obj.BoundingBox.push(boundingBox);}else{obj.projection=boundingBox.crs;boundingBox=obj;} +this.readChildNodes(node,boundingBox);},"BoundingBox":function(node,obj){this.readers['ows']['WGS84BoundingBox'].apply(this,[node,obj]);},"LowerCorner":function(node,obj){var str=this.getChildValue(node).replace(this.regExes.trimSpace,"");str=str.replace(this.regExes.trimComma,",");var pointList=str.split(this.regExes.splitSpace);obj.left=pointList[0];obj.bottom=pointList[1];},"UpperCorner":function(node,obj){var str=this.getChildValue(node).replace(this.regExes.trimSpace,"");str=str.replace(this.regExes.trimComma,",");var pointList=str.split(this.regExes.splitSpace);obj.right=pointList[0];obj.top=pointList[1];obj.bounds=new OpenLayers.Bounds(obj.left,obj.bottom,obj.right,obj.top);delete obj.left;delete obj.bottom;delete obj.right;delete obj.top;},"Language":function(node,obj){obj.language=this.getChildValue(node);}}},writers:{"ows":{"BoundingBox":function(options){var node=this.createElementNSPlus("ows:BoundingBox",{attributes:{crs:options.projection}});this.writeNode("ows:LowerCorner",options,node);this.writeNode("ows:UpperCorner",options,node);return node;},"LowerCorner":function(options){var node=this.createElementNSPlus("ows:LowerCorner",{value:options.bounds.left+" "+options.bounds.bottom});return node;},"UpperCorner":function(options){var node=this.createElementNSPlus("ows:UpperCorner",{value:options.bounds.right+" "+options.bounds.top});return node;},"Identifier":function(identifier){var node=this.createElementNSPlus("ows:Identifier",{value:identifier});return node;},"Title":function(title){var node=this.createElementNSPlus("ows:Title",{value:title});return node;},"Abstract":function(abstractValue){var node=this.createElementNSPlus("ows:Abstract",{value:abstractValue});return node;},"OutputFormat":function(format){var node=this.createElementNSPlus("ows:OutputFormat",{value:format});return node;}}},CLASS_NAME:"OpenLayers.Format.OWSCommon.v1"});OpenLayers.Format.OWSCommon.v1_1_0=OpenLayers.Class(OpenLayers.Format.OWSCommon.v1,{namespaces:{ows:"http://www.opengis.net/ows/1.1",xlink:"http://www.w3.org/1999/xlink"},readers:{"ows":OpenLayers.Util.applyDefaults({"ExceptionReport":function(node,obj){obj.exceptionReport={version:node.getAttribute('version'),language:node.getAttribute('xml:lang'),exceptions:[]};this.readChildNodes(node,obj.exceptionReport);},"AllowedValues":function(node,parameter){parameter.allowedValues={};this.readChildNodes(node,parameter.allowedValues);},"AnyValue":function(node,parameter){parameter.anyValue=true;},"DataType":function(node,parameter){parameter.dataType=this.getChildValue(node);},"Range":function(node,allowedValues){allowedValues.range={};this.readChildNodes(node,allowedValues.range);},"MinimumValue":function(node,range){range.minValue=this.getChildValue(node);},"MaximumValue":function(node,range){range.maxValue=this.getChildValue(node);},"Identifier":function(node,obj){obj.identifier=this.getChildValue(node);},"SupportedCRS":function(node,obj){obj.supportedCRS=this.getChildValue(node);}},OpenLayers.Format.OWSCommon.v1.prototype.readers["ows"])},writers:{"ows":OpenLayers.Util.applyDefaults({"Range":function(range){var node=this.createElementNSPlus("ows:Range",{attributes:{'ows:rangeClosure':range.closure}});this.writeNode("ows:MinimumValue",range.minValue,node);this.writeNode("ows:MaximumValue",range.maxValue,node);return node;},"MinimumValue":function(minValue){var node=this.createElementNSPlus("ows:MinimumValue",{value:minValue});return node;},"MaximumValue":function(maxValue){var node=this.createElementNSPlus("ows:MaximumValue",{value:maxValue});return node;},"Value":function(value){var node=this.createElementNSPlus("ows:Value",{value:value});return node;}},OpenLayers.Format.OWSCommon.v1.prototype.writers["ows"])},CLASS_NAME:"OpenLayers.Format.OWSCommon.v1_1_0"});OpenLayers.Control.Attribution=OpenLayers.Class(OpenLayers.Control,{separator:", ",destroy:function(){this.map.events.un({"removelayer":this.updateAttribution,"addlayer":this.updateAttribution,"changelayer":this.updateAttribution,"changebaselayer":this.updateAttribution,scope:this});OpenLayers.Control.prototype.destroy.apply(this,arguments);},draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);this.map.events.on({'changebaselayer':this.updateAttribution,'changelayer':this.updateAttribution,'addlayer':this.updateAttribution,'removelayer':this.updateAttribution,scope:this});this.updateAttribution();return this.div;},updateAttribution:function(){var attributions=[];if(this.map&&this.map.layers){for(var i=0,len=this.map.layers.length;i<len;i++){var layer=this.map.layers[i];if(layer.attribution&&layer.getVisibility()){if(OpenLayers.Util.indexOf(attributions,layer.attribution)===-1){attributions.push(layer.attribution);}}} +this.div.innerHTML=attributions.join(this.separator);}},CLASS_NAME:"OpenLayers.Control.Attribution"});OpenLayers.Popup=OpenLayers.Class({events:null,id:"",lonlat:null,div:null,contentSize:null,size:null,contentHTML:null,backgroundColor:"",opacity:"",border:"",contentDiv:null,groupDiv:null,closeDiv:null,autoSize:false,minSize:null,maxSize:null,displayClass:"olPopup",contentDisplayClass:"olPopupContent",padding:0,disableFirefoxOverflowHack:false,fixPadding:function(){if(typeof this.padding=="number"){this.padding=new OpenLayers.Bounds(this.padding,this.padding,this.padding,this.padding);}},panMapIfOutOfView:false,keepInMap:false,closeOnMove:false,map:null,initialize:function(id,lonlat,contentSize,contentHTML,closeBox,closeBoxCallback){if(id==null){id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_");} +this.id=id;this.lonlat=lonlat;this.contentSize=(contentSize!=null)?contentSize:new OpenLayers.Size(OpenLayers.Popup.WIDTH,OpenLayers.Popup.HEIGHT);if(contentHTML!=null){this.contentHTML=contentHTML;} +this.backgroundColor=OpenLayers.Popup.COLOR;this.opacity=OpenLayers.Popup.OPACITY;this.border=OpenLayers.Popup.BORDER;this.div=OpenLayers.Util.createDiv(this.id,null,null,null,null,null,"hidden");this.div.className=this.displayClass;var groupDivId=this.id+"_GroupDiv";this.groupDiv=OpenLayers.Util.createDiv(groupDivId,null,null,null,"relative",null,"hidden");var id=this.div.id+"_contentDiv";this.contentDiv=OpenLayers.Util.createDiv(id,null,this.contentSize.clone(),null,"relative");this.contentDiv.className=this.contentDisplayClass;this.groupDiv.appendChild(this.contentDiv);this.div.appendChild(this.groupDiv);if(closeBox){this.addCloseBox(closeBoxCallback);} +this.registerEvents();},destroy:function(){this.id=null;this.lonlat=null;this.size=null;this.contentHTML=null;this.backgroundColor=null;this.opacity=null;this.border=null;if(this.closeOnMove&&this.map){this.map.events.unregister("movestart",this,this.hide);} +this.events.destroy();this.events=null;if(this.closeDiv){OpenLayers.Event.stopObservingElement(this.closeDiv);this.groupDiv.removeChild(this.closeDiv);} +this.closeDiv=null;this.div.removeChild(this.groupDiv);this.groupDiv=null;if(this.map!=null){this.map.removePopup(this);} +this.map=null;this.div=null;this.autoSize=null;this.minSize=null;this.maxSize=null;this.padding=null;this.panMapIfOutOfView=null;},draw:function(px){if(px==null){if((this.lonlat!=null)&&(this.map!=null)){px=this.map.getLayerPxFromLonLat(this.lonlat);}} +if(this.closeOnMove){this.map.events.register("movestart",this,this.hide);} +if(!this.disableFirefoxOverflowHack&&OpenLayers.BROWSER_NAME=='firefox'){this.map.events.register("movestart",this,function(){var style=document.defaultView.getComputedStyle(this.contentDiv,null);var currentOverflow=style.getPropertyValue("overflow");if(currentOverflow!="hidden"){this.contentDiv._oldOverflow=currentOverflow;this.contentDiv.style.overflow="hidden";}});this.map.events.register("moveend",this,function(){var oldOverflow=this.contentDiv._oldOverflow;if(oldOverflow){this.contentDiv.style.overflow=oldOverflow;this.contentDiv._oldOverflow=null;}});} +this.moveTo(px);if(!this.autoSize&&!this.size){this.setSize(this.contentSize);} +this.setBackgroundColor();this.setOpacity();this.setBorder();this.setContentHTML();if(this.panMapIfOutOfView){this.panIntoView();} +return this.div;},updatePosition:function(){if((this.lonlat)&&(this.map)){var px=this.map.getLayerPxFromLonLat(this.lonlat);if(px){this.moveTo(px);}}},moveTo:function(px){if((px!=null)&&(this.div!=null)){this.div.style.left=px.x+"px";this.div.style.top=px.y+"px";}},visible:function(){return OpenLayers.Element.visible(this.div);},toggle:function(){if(this.visible()){this.hide();}else{this.show();}},show:function(){this.div.style.display='';if(this.panMapIfOutOfView){this.panIntoView();}},hide:function(){this.div.style.display='none';},setSize:function(contentSize){this.size=contentSize.clone();var contentDivPadding=this.getContentDivPadding();var wPadding=contentDivPadding.left+contentDivPadding.right;var hPadding=contentDivPadding.top+contentDivPadding.bottom;this.fixPadding();wPadding+=this.padding.left+this.padding.right;hPadding+=this.padding.top+this.padding.bottom;if(this.closeDiv){var closeDivWidth=parseInt(this.closeDiv.style.width);wPadding+=closeDivWidth+contentDivPadding.right;} +this.size.w+=wPadding;this.size.h+=hPadding;if(OpenLayers.BROWSER_NAME=="msie"){this.contentSize.w+=contentDivPadding.left+contentDivPadding.right;this.contentSize.h+=contentDivPadding.bottom+contentDivPadding.top;} +if(this.div!=null){this.div.style.width=this.size.w+"px";this.div.style.height=this.size.h+"px";} +if(this.contentDiv!=null){this.contentDiv.style.width=contentSize.w+"px";this.contentDiv.style.height=contentSize.h+"px";}},updateSize:function(){var preparedHTML="<div class='"+this.contentDisplayClass+"'>"+ +this.contentDiv.innerHTML+"</div>";var containerElement=(this.map)?this.map.layerContainerDiv:document.body;var realSize=OpenLayers.Util.getRenderedDimensions(preparedHTML,null,{displayClass:this.displayClass,containerElement:containerElement});var safeSize=this.getSafeContentSize(realSize);var newSize=null;if(safeSize.equals(realSize)){newSize=realSize;}else{var fixedSize=new OpenLayers.Size();fixedSize.w=(safeSize.w<realSize.w)?safeSize.w:null;fixedSize.h=(safeSize.h<realSize.h)?safeSize.h:null;if(fixedSize.w&&fixedSize.h){newSize=safeSize;}else{var clippedSize=OpenLayers.Util.getRenderedDimensions(preparedHTML,fixedSize,{displayClass:this.contentDisplayClass,containerElement:containerElement});var currentOverflow=OpenLayers.Element.getStyle(this.contentDiv,"overflow");if((currentOverflow!="hidden")&&(clippedSize.equals(safeSize))){var scrollBar=OpenLayers.Util.getScrollbarWidth();if(fixedSize.w){clippedSize.h+=scrollBar;}else{clippedSize.w+=scrollBar;}} +newSize=this.getSafeContentSize(clippedSize);}} +this.setSize(newSize);},setBackgroundColor:function(color){if(color!=undefined){this.backgroundColor=color;} +if(this.div!=null){this.div.style.backgroundColor=this.backgroundColor;}},setOpacity:function(opacity){if(opacity!=undefined){this.opacity=opacity;} +if(this.div!=null){this.div.style.opacity=this.opacity;this.div.style.filter='alpha(opacity='+this.opacity*100+')';}},setBorder:function(border){if(border!=undefined){this.border=border;} +if(this.div!=null){this.div.style.border=this.border;}},setContentHTML:function(contentHTML){if(contentHTML!=null){this.contentHTML=contentHTML;} +if((this.contentDiv!=null)&&(this.contentHTML!=null)&&(this.contentHTML!=this.contentDiv.innerHTML)){this.contentDiv.innerHTML=this.contentHTML;if(this.autoSize){this.registerImageListeners();this.updateSize();}}},registerImageListeners:function(){var onImgLoad=function(){this.popup.updateSize();if(this.popup.visible()&&this.popup.panMapIfOutOfView){this.popup.panIntoView();} +OpenLayers.Event.stopObserving(this.img,"load",this.img._onImageLoad);};var images=this.contentDiv.getElementsByTagName("img");for(var i=0,len=images.length;i<len;i++){var img=images[i];if(img.width==0||img.height==0){var context={'popup':this,'img':img};img._onImgLoad=OpenLayers.Function.bind(onImgLoad,context);OpenLayers.Event.observe(img,'load',img._onImgLoad);}}},getSafeContentSize:function(size){var safeContentSize=size.clone();var contentDivPadding=this.getContentDivPadding();var wPadding=contentDivPadding.left+contentDivPadding.right;var hPadding=contentDivPadding.top+contentDivPadding.bottom;this.fixPadding();wPadding+=this.padding.left+this.padding.right;hPadding+=this.padding.top+this.padding.bottom;if(this.closeDiv){var closeDivWidth=parseInt(this.closeDiv.style.width);wPadding+=closeDivWidth+contentDivPadding.right;} +if(this.minSize){safeContentSize.w=Math.max(safeContentSize.w,(this.minSize.w-wPadding));safeContentSize.h=Math.max(safeContentSize.h,(this.minSize.h-hPadding));} +if(this.maxSize){safeContentSize.w=Math.min(safeContentSize.w,(this.maxSize.w-wPadding));safeContentSize.h=Math.min(safeContentSize.h,(this.maxSize.h-hPadding));} +if(this.map&&this.map.size){var extraX=0,extraY=0;if(this.keepInMap&&!this.panMapIfOutOfView){var px=this.map.getPixelFromLonLat(this.lonlat);switch(this.relativePosition){case"tr":extraX=px.x;extraY=this.map.size.h-px.y;break;case"tl":extraX=this.map.size.w-px.x;extraY=this.map.size.h-px.y;break;case"bl":extraX=this.map.size.w-px.x;extraY=px.y;break;case"br":extraX=px.x;extraY=px.y;break;default:extraX=px.x;extraY=this.map.size.h-px.y;break;}} +var maxY=this.map.size.h- +this.map.paddingForPopups.top- +this.map.paddingForPopups.bottom- +hPadding-extraY;var maxX=this.map.size.w- +this.map.paddingForPopups.left- +this.map.paddingForPopups.right- +wPadding-extraX;safeContentSize.w=Math.min(safeContentSize.w,maxX);safeContentSize.h=Math.min(safeContentSize.h,maxY);} +return safeContentSize;},getContentDivPadding:function(){var contentDivPadding=this._contentDivPadding;if(!contentDivPadding){if(this.div.parentNode==null){this.div.style.display="none";document.body.appendChild(this.div);} +contentDivPadding=new OpenLayers.Bounds(OpenLayers.Element.getStyle(this.contentDiv,"padding-left"),OpenLayers.Element.getStyle(this.contentDiv,"padding-bottom"),OpenLayers.Element.getStyle(this.contentDiv,"padding-right"),OpenLayers.Element.getStyle(this.contentDiv,"padding-top"));this._contentDivPadding=contentDivPadding;if(this.div.parentNode==document.body){document.body.removeChild(this.div);this.div.style.display="";}} +return contentDivPadding;},addCloseBox:function(callback){this.closeDiv=OpenLayers.Util.createDiv(this.id+"_close",null,new OpenLayers.Size(17,17));this.closeDiv.className="olPopupCloseBox";var contentDivPadding=this.getContentDivPadding();this.closeDiv.style.right=contentDivPadding.right+"px";this.closeDiv.style.top=contentDivPadding.top+"px";this.groupDiv.appendChild(this.closeDiv);var closePopup=callback||function(e){this.hide();OpenLayers.Event.stop(e);};OpenLayers.Event.observe(this.closeDiv,"touchend",OpenLayers.Function.bindAsEventListener(closePopup,this));OpenLayers.Event.observe(this.closeDiv,"click",OpenLayers.Function.bindAsEventListener(closePopup,this));},panIntoView:function(){var mapSize=this.map.getSize();var origTL=this.map.getViewPortPxFromLayerPx(new OpenLayers.Pixel(parseInt(this.div.style.left),parseInt(this.div.style.top)));var newTL=origTL.clone();if(origTL.x<this.map.paddingForPopups.left){newTL.x=this.map.paddingForPopups.left;}else +if((origTL.x+this.size.w)>(mapSize.w-this.map.paddingForPopups.right)){newTL.x=mapSize.w-this.map.paddingForPopups.right-this.size.w;} +if(origTL.y<this.map.paddingForPopups.top){newTL.y=this.map.paddingForPopups.top;}else +if((origTL.y+this.size.h)>(mapSize.h-this.map.paddingForPopups.bottom)){newTL.y=mapSize.h-this.map.paddingForPopups.bottom-this.size.h;} +var dx=origTL.x-newTL.x;var dy=origTL.y-newTL.y;this.map.pan(dx,dy);},registerEvents:function(){this.events=new OpenLayers.Events(this,this.div,null,true);function onTouchstart(evt){OpenLayers.Event.stop(evt,true);} +this.events.on({"mousedown":this.onmousedown,"mousemove":this.onmousemove,"mouseup":this.onmouseup,"click":this.onclick,"mouseout":this.onmouseout,"dblclick":this.ondblclick,"touchstart":onTouchstart,scope:this});},onmousedown:function(evt){this.mousedown=true;OpenLayers.Event.stop(evt,true);},onmousemove:function(evt){if(this.mousedown){OpenLayers.Event.stop(evt,true);}},onmouseup:function(evt){if(this.mousedown){this.mousedown=false;OpenLayers.Event.stop(evt,true);}},onclick:function(evt){OpenLayers.Event.stop(evt,true);},onmouseout:function(evt){this.mousedown=false;},ondblclick:function(evt){OpenLayers.Event.stop(evt,true);},CLASS_NAME:"OpenLayers.Popup"});OpenLayers.Popup.WIDTH=200;OpenLayers.Popup.HEIGHT=200;OpenLayers.Popup.COLOR="white";OpenLayers.Popup.OPACITY=1;OpenLayers.Popup.BORDER="0px";OpenLayers.Popup.Anchored=OpenLayers.Class(OpenLayers.Popup,{relativePosition:null,keepInMap:true,anchor:null,initialize:function(id,lonlat,contentSize,contentHTML,anchor,closeBox,closeBoxCallback){var newArguments=[id,lonlat,contentSize,contentHTML,closeBox,closeBoxCallback];OpenLayers.Popup.prototype.initialize.apply(this,newArguments);this.anchor=(anchor!=null)?anchor:{size:new OpenLayers.Size(0,0),offset:new OpenLayers.Pixel(0,0)};},destroy:function(){this.anchor=null;this.relativePosition=null;OpenLayers.Popup.prototype.destroy.apply(this,arguments);},show:function(){this.updatePosition();OpenLayers.Popup.prototype.show.apply(this,arguments);},moveTo:function(px){var oldRelativePosition=this.relativePosition;this.relativePosition=this.calculateRelativePosition(px);var newPx=this.calculateNewPx(px);var newArguments=new Array(newPx);OpenLayers.Popup.prototype.moveTo.apply(this,newArguments);if(this.relativePosition!=oldRelativePosition){this.updateRelativePosition();}},setSize:function(contentSize){OpenLayers.Popup.prototype.setSize.apply(this,arguments);if((this.lonlat)&&(this.map)){var px=this.map.getLayerPxFromLonLat(this.lonlat);this.moveTo(px);}},calculateRelativePosition:function(px){var lonlat=this.map.getLonLatFromLayerPx(px);var extent=this.map.getExtent();var quadrant=extent.determineQuadrant(lonlat);return OpenLayers.Bounds.oppositeQuadrant(quadrant);},updateRelativePosition:function(){},calculateNewPx:function(px){var newPx=px.offset(this.anchor.offset);var size=this.size||this.contentSize;var top=(this.relativePosition.charAt(0)=='t');newPx.y+=(top)?-size.h:this.anchor.size.h;var left=(this.relativePosition.charAt(1)=='l');newPx.x+=(left)?-size.w:this.anchor.size.w;return newPx;},CLASS_NAME:"OpenLayers.Popup.Anchored"});OpenLayers.Popup.Framed=OpenLayers.Class(OpenLayers.Popup.Anchored,{imageSrc:null,imageSize:null,isAlphaImage:false,positionBlocks:null,blocks:null,fixedRelativePosition:false,initialize:function(id,lonlat,contentSize,contentHTML,anchor,closeBox,closeBoxCallback){OpenLayers.Popup.Anchored.prototype.initialize.apply(this,arguments);if(this.fixedRelativePosition){this.updateRelativePosition();this.calculateRelativePosition=function(px){return this.relativePosition;};} +this.contentDiv.style.position="absolute";this.contentDiv.style.zIndex=1;if(closeBox){this.closeDiv.style.zIndex=1;} +this.groupDiv.style.position="absolute";this.groupDiv.style.top="0px";this.groupDiv.style.left="0px";this.groupDiv.style.height="100%";this.groupDiv.style.width="100%";},destroy:function(){this.imageSrc=null;this.imageSize=null;this.isAlphaImage=null;this.fixedRelativePosition=false;this.positionBlocks=null;for(var i=0;i<this.blocks.length;i++){var block=this.blocks[i];if(block.image){block.div.removeChild(block.image);} +block.image=null;if(block.div){this.groupDiv.removeChild(block.div);} +block.div=null;} +this.blocks=null;OpenLayers.Popup.Anchored.prototype.destroy.apply(this,arguments);},setBackgroundColor:function(color){},setBorder:function(){},setOpacity:function(opacity){},setSize:function(contentSize){OpenLayers.Popup.Anchored.prototype.setSize.apply(this,arguments);this.updateBlocks();},updateRelativePosition:function(){this.padding=this.positionBlocks[this.relativePosition].padding;if(this.closeDiv){var contentDivPadding=this.getContentDivPadding();this.closeDiv.style.right=contentDivPadding.right+ +this.padding.right+"px";this.closeDiv.style.top=contentDivPadding.top+ +this.padding.top+"px";} +this.updateBlocks();},calculateNewPx:function(px){var newPx=OpenLayers.Popup.Anchored.prototype.calculateNewPx.apply(this,arguments);newPx=newPx.offset(this.positionBlocks[this.relativePosition].offset);return newPx;},createBlocks:function(){this.blocks=[];var firstPosition=null;for(var key in this.positionBlocks){firstPosition=key;break;} +var position=this.positionBlocks[firstPosition];for(var i=0;i<position.blocks.length;i++){var block={};this.blocks.push(block);var divId=this.id+'_FrameDecorationDiv_'+i;block.div=OpenLayers.Util.createDiv(divId,null,null,null,"absolute",null,"hidden",null);var imgId=this.id+'_FrameDecorationImg_'+i;var imageCreator=(this.isAlphaImage)?OpenLayers.Util.createAlphaImageDiv:OpenLayers.Util.createImage;block.image=imageCreator(imgId,null,this.imageSize,this.imageSrc,"absolute",null,null,null);block.div.appendChild(block.image);this.groupDiv.appendChild(block.div);}},updateBlocks:function(){if(!this.blocks){this.createBlocks();} +if(this.size&&this.relativePosition){var position=this.positionBlocks[this.relativePosition];for(var i=0;i<position.blocks.length;i++){var positionBlock=position.blocks[i];var block=this.blocks[i];var l=positionBlock.anchor.left;var b=positionBlock.anchor.bottom;var r=positionBlock.anchor.right;var t=positionBlock.anchor.top;var w=(isNaN(positionBlock.size.w))?this.size.w-(r+l):positionBlock.size.w;var h=(isNaN(positionBlock.size.h))?this.size.h-(b+t):positionBlock.size.h;block.div.style.width=(w<0?0:w)+'px';block.div.style.height=(h<0?0:h)+'px';block.div.style.left=(l!=null)?l+'px':'';block.div.style.bottom=(b!=null)?b+'px':'';block.div.style.right=(r!=null)?r+'px':'';block.div.style.top=(t!=null)?t+'px':'';block.image.style.left=positionBlock.position.x+'px';block.image.style.top=positionBlock.position.y+'px';} +this.contentDiv.style.left=this.padding.left+"px";this.contentDiv.style.top=this.padding.top+"px";}},CLASS_NAME:"OpenLayers.Popup.Framed"});OpenLayers.Filter.Logical=OpenLayers.Class(OpenLayers.Filter,{filters:null,type:null,initialize:function(options){this.filters=[];OpenLayers.Filter.prototype.initialize.apply(this,[options]);},destroy:function(){this.filters=null;OpenLayers.Filter.prototype.destroy.apply(this);},evaluate:function(context){var i,len;switch(this.type){case OpenLayers.Filter.Logical.AND:for(i=0,len=this.filters.length;i<len;i++){if(this.filters[i].evaluate(context)==false){return false;}} +return true;case OpenLayers.Filter.Logical.OR:for(i=0,len=this.filters.length;i<len;i++){if(this.filters[i].evaluate(context)==true){return true;}} +return false;case OpenLayers.Filter.Logical.NOT:return(!this.filters[0].evaluate(context));} +return undefined;},clone:function(){var filters=[];for(var i=0,len=this.filters.length;i<len;++i){filters.push(this.filters[i].clone());} +return new OpenLayers.Filter.Logical({type:this.type,filters:filters});},CLASS_NAME:"OpenLayers.Filter.Logical"});OpenLayers.Filter.Logical.AND="&&";OpenLayers.Filter.Logical.OR="||";OpenLayers.Filter.Logical.NOT="!";OpenLayers.Handler.Drag=OpenLayers.Class(OpenLayers.Handler,{started:false,stopDown:true,dragging:false,touch:false,last:null,start:null,lastMoveEvt:null,oldOnselectstart:null,interval:0,timeoutId:null,documentDrag:false,documentEvents:null,initialize:function(control,callbacks,options){OpenLayers.Handler.prototype.initialize.apply(this,arguments);if(this.documentDrag===true){var me=this;this._docMove=function(evt){me.mousemove({xy:{x:evt.clientX,y:evt.clientY},element:document});};this._docUp=function(evt){me.mouseup({xy:{x:evt.clientX,y:evt.clientY}});};}},dragstart:function(evt){var propagate=true;this.dragging=false;if(this.checkModifiers(evt)&&(OpenLayers.Event.isLeftClick(evt)||OpenLayers.Event.isSingleTouch(evt))){this.started=true;this.start=evt.xy;this.last=evt.xy;OpenLayers.Element.addClass(this.map.viewPortDiv,"olDragDown");this.down(evt);this.callback("down",[evt.xy]);OpenLayers.Event.stop(evt);if(!this.oldOnselectstart){this.oldOnselectstart=document.onselectstart?document.onselectstart:OpenLayers.Function.True;} +document.onselectstart=OpenLayers.Function.False;propagate=!this.stopDown;}else{this.started=false;this.start=null;this.last=null;} +return propagate;},dragmove:function(evt){this.lastMoveEvt=evt;if(this.started&&!this.timeoutId&&(evt.xy.x!=this.last.x||evt.xy.y!=this.last.y)){if(this.documentDrag===true&&this.documentEvents){if(evt.element===document){this.adjustXY(evt);this.setEvent(evt);}else{this.removeDocumentEvents();}} +if(this.interval>0){this.timeoutId=setTimeout(OpenLayers.Function.bind(this.removeTimeout,this),this.interval);} +this.dragging=true;this.move(evt);this.callback("move",[evt.xy]);if(!this.oldOnselectstart){this.oldOnselectstart=document.onselectstart;document.onselectstart=OpenLayers.Function.False;} +this.last=evt.xy;} +return true;},dragend:function(evt){if(this.started){if(this.documentDrag===true&&this.documentEvents){this.adjustXY(evt);this.removeDocumentEvents();} +var dragged=(this.start!=this.last);this.started=false;this.dragging=false;OpenLayers.Element.removeClass(this.map.viewPortDiv,"olDragDown");this.up(evt);this.callback("up",[evt.xy]);if(dragged){this.callback("done",[evt.xy]);} +document.onselectstart=this.oldOnselectstart;} +return true;},down:function(evt){},move:function(evt){},up:function(evt){},out:function(evt){},mousedown:function(evt){return this.dragstart(evt);},touchstart:function(evt){if(!this.touch){this.touch=true;this.map.events.un({mousedown:this.mousedown,mouseup:this.mouseup,mousemove:this.mousemove,click:this.click,scope:this});} +return this.dragstart(evt);},mousemove:function(evt){return this.dragmove(evt);},touchmove:function(evt){return this.dragmove(evt);},removeTimeout:function(){this.timeoutId=null;if(this.dragging){this.mousemove(this.lastMoveEvt);}},mouseup:function(evt){return this.dragend(evt);},touchend:function(evt){evt.xy=this.last;return this.dragend(evt);},mouseout:function(evt){if(this.started&&OpenLayers.Util.mouseLeft(evt,this.map.eventsDiv)){if(this.documentDrag===true){this.addDocumentEvents();}else{var dragged=(this.start!=this.last);this.started=false;this.dragging=false;OpenLayers.Element.removeClass(this.map.viewPortDiv,"olDragDown");this.out(evt);this.callback("out",[]);if(dragged){this.callback("done",[evt.xy]);} +if(document.onselectstart){document.onselectstart=this.oldOnselectstart;}}} +return true;},click:function(evt){return(this.start==this.last);},activate:function(){var activated=false;if(OpenLayers.Handler.prototype.activate.apply(this,arguments)){this.dragging=false;activated=true;} +return activated;},deactivate:function(){var deactivated=false;if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){this.touch=false;this.started=false;this.dragging=false;this.start=null;this.last=null;deactivated=true;OpenLayers.Element.removeClass(this.map.viewPortDiv,"olDragDown");} +return deactivated;},adjustXY:function(evt){var pos=OpenLayers.Util.pagePosition(this.map.viewPortDiv);evt.xy.x-=pos[0];evt.xy.y-=pos[1];},addDocumentEvents:function(){OpenLayers.Element.addClass(document.body,"olDragDown");this.documentEvents=true;OpenLayers.Event.observe(document,"mousemove",this._docMove);OpenLayers.Event.observe(document,"mouseup",this._docUp);},removeDocumentEvents:function(){OpenLayers.Element.removeClass(document.body,"olDragDown");this.documentEvents=false;OpenLayers.Event.stopObserving(document,"mousemove",this._docMove);OpenLayers.Event.stopObserving(document,"mouseup",this._docUp);},CLASS_NAME:"OpenLayers.Handler.Drag"});OpenLayers.Handler.Box=OpenLayers.Class(OpenLayers.Handler,{dragHandler:null,boxDivClassName:'olHandlerBoxZoomBox',boxOffsets:null,initialize:function(control,callbacks,options){OpenLayers.Handler.prototype.initialize.apply(this,arguments);this.dragHandler=new OpenLayers.Handler.Drag(this,{down:this.startBox,move:this.moveBox,out:this.removeBox,up:this.endBox},{keyMask:this.keyMask});},destroy:function(){OpenLayers.Handler.prototype.destroy.apply(this,arguments);if(this.dragHandler){this.dragHandler.destroy();this.dragHandler=null;}},setMap:function(map){OpenLayers.Handler.prototype.setMap.apply(this,arguments);if(this.dragHandler){this.dragHandler.setMap(map);}},startBox:function(xy){this.callback("start",[]);this.zoomBox=OpenLayers.Util.createDiv('zoomBox',new OpenLayers.Pixel(-9999,-9999));this.zoomBox.className=this.boxDivClassName;this.zoomBox.style.zIndex=this.map.Z_INDEX_BASE["Popup"]-1;this.map.eventsDiv.appendChild(this.zoomBox);OpenLayers.Element.addClass(this.map.eventsDiv,"olDrawBox");},moveBox:function(xy){var startX=this.dragHandler.start.x;var startY=this.dragHandler.start.y;var deltaX=Math.abs(startX-xy.x);var deltaY=Math.abs(startY-xy.y);var offset=this.getBoxOffsets();this.zoomBox.style.width=(deltaX+offset.width+1)+"px";this.zoomBox.style.height=(deltaY+offset.height+1)+"px";this.zoomBox.style.left=(xy.x<startX?startX-deltaX-offset.left:startX-offset.left)+"px";this.zoomBox.style.top=(xy.y<startY?startY-deltaY-offset.top:startY-offset.top)+"px";},endBox:function(end){var result;if(Math.abs(this.dragHandler.start.x-end.x)>5||Math.abs(this.dragHandler.start.y-end.y)>5){var start=this.dragHandler.start;var top=Math.min(start.y,end.y);var bottom=Math.max(start.y,end.y);var left=Math.min(start.x,end.x);var right=Math.max(start.x,end.x);result=new OpenLayers.Bounds(left,bottom,right,top);}else{result=this.dragHandler.start.clone();} +this.removeBox();this.callback("done",[result]);},removeBox:function(){this.map.eventsDiv.removeChild(this.zoomBox);this.zoomBox=null;this.boxOffsets=null;OpenLayers.Element.removeClass(this.map.eventsDiv,"olDrawBox");},activate:function(){if(OpenLayers.Handler.prototype.activate.apply(this,arguments)){this.dragHandler.activate();return true;}else{return false;}},deactivate:function(){if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){if(this.dragHandler.deactivate()){if(this.zoomBox){this.removeBox();}} +return true;}else{return false;}},getBoxOffsets:function(){if(!this.boxOffsets){var testDiv=document.createElement("div");testDiv.style.position="absolute";testDiv.style.border="1px solid black";testDiv.style.width="3px";document.body.appendChild(testDiv);var w3cBoxModel=testDiv.clientWidth==3;document.body.removeChild(testDiv);var left=parseInt(OpenLayers.Element.getStyle(this.zoomBox,"border-left-width"));var right=parseInt(OpenLayers.Element.getStyle(this.zoomBox,"border-right-width"));var top=parseInt(OpenLayers.Element.getStyle(this.zoomBox,"border-top-width"));var bottom=parseInt(OpenLayers.Element.getStyle(this.zoomBox,"border-bottom-width"));this.boxOffsets={left:left,right:right,top:top,bottom:bottom,width:w3cBoxModel===false?left+right:0,height:w3cBoxModel===false?top+bottom:0};} +return this.boxOffsets;},CLASS_NAME:"OpenLayers.Handler.Box"});OpenLayers.Control.ZoomBox=OpenLayers.Class(OpenLayers.Control,{type:OpenLayers.Control.TYPE_TOOL,out:false,alwaysZoom:false,draw:function(){this.handler=new OpenLayers.Handler.Box(this,{done:this.zoomBox},{keyMask:this.keyMask});},zoomBox:function(position){if(position instanceof OpenLayers.Bounds){var bounds;if(!this.out){var minXY=this.map.getLonLatFromPixel(new OpenLayers.Pixel(position.left,position.bottom));var maxXY=this.map.getLonLatFromPixel(new OpenLayers.Pixel(position.right,position.top));bounds=new OpenLayers.Bounds(minXY.lon,minXY.lat,maxXY.lon,maxXY.lat);}else{var pixWidth=Math.abs(position.right-position.left);var pixHeight=Math.abs(position.top-position.bottom);var zoomFactor=Math.min((this.map.size.h/pixHeight),(this.map.size.w/pixWidth));var extent=this.map.getExtent();var center=this.map.getLonLatFromPixel(position.getCenterPixel());var xmin=center.lon-(extent.getWidth()/2)*zoomFactor;var xmax=center.lon+(extent.getWidth()/2)*zoomFactor;var ymin=center.lat-(extent.getHeight()/2)*zoomFactor;var ymax=center.lat+(extent.getHeight()/2)*zoomFactor;bounds=new OpenLayers.Bounds(xmin,ymin,xmax,ymax);} +var lastZoom=this.map.getZoom();this.map.zoomToExtent(bounds);if(lastZoom==this.map.getZoom()&&this.alwaysZoom==true){this.map.zoomTo(lastZoom+(this.out?-1:1));}}else{if(!this.out){this.map.setCenter(this.map.getLonLatFromPixel(position),this.map.getZoom()+1);}else{this.map.setCenter(this.map.getLonLatFromPixel(position),this.map.getZoom()-1);}}},CLASS_NAME:"OpenLayers.Control.ZoomBox"});OpenLayers.Control.DragPan=OpenLayers.Class(OpenLayers.Control,{type:OpenLayers.Control.TYPE_TOOL,panned:false,interval:1,documentDrag:false,kinetic:null,enableKinetic:false,kineticInterval:10,draw:function(){if(this.enableKinetic){var config={interval:this.kineticInterval};if(typeof this.enableKinetic==="object"){config=OpenLayers.Util.extend(config,this.enableKinetic);} +this.kinetic=new OpenLayers.Kinetic(config);} +this.handler=new OpenLayers.Handler.Drag(this,{"move":this.panMap,"done":this.panMapDone,"down":this.panMapStart},{interval:this.interval,documentDrag:this.documentDrag});},panMapStart:function(){if(this.kinetic){this.kinetic.begin();}},panMap:function(xy){if(this.kinetic){this.kinetic.update(xy);} +this.panned=true;this.map.pan(this.handler.last.x-xy.x,this.handler.last.y-xy.y,{dragging:true,animate:false});},panMapDone:function(xy){if(this.panned){var res=null;if(this.kinetic){res=this.kinetic.end(xy);} +this.map.pan(this.handler.last.x-xy.x,this.handler.last.y-xy.y,{dragging:!!res,animate:false});if(res){var self=this;this.kinetic.move(res,function(x,y,end){self.map.pan(x,y,{dragging:!end,animate:false});});} +this.panned=false;}},CLASS_NAME:"OpenLayers.Control.DragPan"});OpenLayers.Handler.Click=OpenLayers.Class(OpenLayers.Handler,{delay:300,single:true,'double':false,pixelTolerance:0,dblclickTolerance:13,stopSingle:false,stopDouble:false,timerId:null,touch:false,down:null,last:null,first:null,rightclickTimerId:null,initialize:function(control,callbacks,options){OpenLayers.Handler.prototype.initialize.apply(this,arguments);},touchstart:function(evt){if(!this.touch){this.unregisterMouseListeners();this.touch=true;} +this.down=this.getEventInfo(evt);this.last=this.getEventInfo(evt);return true;},touchmove:function(evt){this.last=this.getEventInfo(evt);return true;},touchend:function(evt){if(this.down){evt.xy=this.last.xy;evt.lastTouches=this.last.touches;this.handleSingle(evt);this.down=null;} +return true;},unregisterMouseListeners:function(){this.map.events.un({mousedown:this.mousedown,mouseup:this.mouseup,click:this.click,dblclick:this.dblclick,scope:this});},mousedown:function(evt){this.down=this.getEventInfo(evt);this.last=this.getEventInfo(evt);return true;},mouseup:function(evt){var propagate=true;if(this.checkModifiers(evt)&&this.control.handleRightClicks&&OpenLayers.Event.isRightClick(evt)){propagate=this.rightclick(evt);} +return propagate;},rightclick:function(evt){if(this.passesTolerance(evt)){if(this.rightclickTimerId!=null){this.clearTimer();this.callback('dblrightclick',[evt]);return!this.stopDouble;}else{var clickEvent=this['double']?OpenLayers.Util.extend({},evt):this.callback('rightclick',[evt]);var delayedRightCall=OpenLayers.Function.bind(this.delayedRightCall,this,clickEvent);this.rightclickTimerId=window.setTimeout(delayedRightCall,this.delay);}} +return!this.stopSingle;},delayedRightCall:function(evt){this.rightclickTimerId=null;if(evt){this.callback('rightclick',[evt]);}},click:function(evt){if(!this.last){this.last=this.getEventInfo(evt);} +this.handleSingle(evt);return!this.stopSingle;},dblclick:function(evt){this.handleDouble(evt);return!this.stopDouble;},handleDouble:function(evt){if(this["double"]&&this.passesDblclickTolerance(evt)){this.callback("dblclick",[evt]);}},handleSingle:function(evt){if(this.passesTolerance(evt)){if(this.timerId!=null){if(this.last.touches&&this.last.touches.length===1){if(this["double"]){OpenLayers.Event.stop(evt);} +this.handleDouble(evt);} +if(!this.last.touches||this.last.touches.length!==2){this.clearTimer();}}else{this.first=this.getEventInfo(evt);var clickEvent=this.single?OpenLayers.Util.extend({},evt):null;this.queuePotentialClick(clickEvent);}}},queuePotentialClick:function(evt){this.timerId=window.setTimeout(OpenLayers.Function.bind(this.delayedCall,this,evt),this.delay);},passesTolerance:function(evt){var passes=true;if(this.pixelTolerance!=null&&this.down&&this.down.xy){passes=this.pixelTolerance>=this.down.xy.distanceTo(evt.xy);if(passes&&this.touch&&this.down.touches.length===this.last.touches.length){for(var i=0,ii=this.down.touches.length;i<ii;++i){if(this.getTouchDistance(this.down.touches[i],this.last.touches[i])>this.pixelTolerance){passes=false;break;}}}} +return passes;},getTouchDistance:function(from,to){return Math.sqrt(Math.pow(from.clientX-to.clientX,2)+ +Math.pow(from.clientY-to.clientY,2));},passesDblclickTolerance:function(evt){var passes=true;if(this.down&&this.first){passes=this.down.xy.distanceTo(this.first.xy)<=this.dblclickTolerance;} +return passes;},clearTimer:function(){if(this.timerId!=null){window.clearTimeout(this.timerId);this.timerId=null;} +if(this.rightclickTimerId!=null){window.clearTimeout(this.rightclickTimerId);this.rightclickTimerId=null;}},delayedCall:function(evt){this.timerId=null;if(evt){this.callback("click",[evt]);}},getEventInfo:function(evt){var touches;if(evt.touches){var len=evt.touches.length;touches=new Array(len);var touch;for(var i=0;i<len;i++){touch=evt.touches[i];touches[i]={clientX:touch.clientX,clientY:touch.clientY};}} +return{xy:evt.xy,touches:touches};},deactivate:function(){var deactivated=false;if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){this.clearTimer();this.down=null;this.first=null;this.last=null;this.touch=false;deactivated=true;} +return deactivated;},CLASS_NAME:"OpenLayers.Handler.Click"});OpenLayers.Control.Navigation=OpenLayers.Class(OpenLayers.Control,{dragPan:null,dragPanOptions:null,pinchZoom:null,pinchZoomOptions:null,documentDrag:false,zoomBox:null,zoomBoxEnabled:true,zoomWheelEnabled:true,mouseWheelOptions:null,handleRightClicks:false,zoomBoxKeyMask:OpenLayers.Handler.MOD_SHIFT,autoActivate:true,initialize:function(options){this.handlers={};OpenLayers.Control.prototype.initialize.apply(this,arguments);},destroy:function(){this.deactivate();if(this.dragPan){this.dragPan.destroy();} +this.dragPan=null;if(this.zoomBox){this.zoomBox.destroy();} +this.zoomBox=null;if(this.pinchZoom){this.pinchZoom.destroy();} +this.pinchZoom=null;OpenLayers.Control.prototype.destroy.apply(this,arguments);},activate:function(){this.dragPan.activate();if(this.zoomWheelEnabled){this.handlers.wheel.activate();} +this.handlers.click.activate();if(this.zoomBoxEnabled){this.zoomBox.activate();} +if(this.pinchZoom){this.pinchZoom.activate();} +return OpenLayers.Control.prototype.activate.apply(this,arguments);},deactivate:function(){if(this.pinchZoom){this.pinchZoom.deactivate();} +this.zoomBox.deactivate();this.dragPan.deactivate();this.handlers.click.deactivate();this.handlers.wheel.deactivate();return OpenLayers.Control.prototype.deactivate.apply(this,arguments);},draw:function(){if(this.handleRightClicks){this.map.viewPortDiv.oncontextmenu=OpenLayers.Function.False;} +var clickCallbacks={'click':this.defaultClick,'dblclick':this.defaultDblClick,'dblrightclick':this.defaultDblRightClick};var clickOptions={'double':true,'stopDouble':true};this.handlers.click=new OpenLayers.Handler.Click(this,clickCallbacks,clickOptions);this.dragPan=new OpenLayers.Control.DragPan(OpenLayers.Util.extend({map:this.map,documentDrag:this.documentDrag},this.dragPanOptions));this.zoomBox=new OpenLayers.Control.ZoomBox({map:this.map,keyMask:this.zoomBoxKeyMask});this.dragPan.draw();this.zoomBox.draw();this.handlers.wheel=new OpenLayers.Handler.MouseWheel(this,{"up":this.wheelUp,"down":this.wheelDown},this.mouseWheelOptions);if(OpenLayers.Control.PinchZoom){this.pinchZoom=new OpenLayers.Control.PinchZoom(OpenLayers.Util.extend({map:this.map},this.pinchZoomOptions));}},defaultClick:function(evt){if(evt.lastTouches&&evt.lastTouches.length==2){this.map.zoomOut();}},defaultDblClick:function(evt){var newCenter=this.map.getLonLatFromViewPortPx(evt.xy);this.map.setCenter(newCenter,this.map.zoom+1);},defaultDblRightClick:function(evt){var newCenter=this.map.getLonLatFromViewPortPx(evt.xy);this.map.setCenter(newCenter,this.map.zoom-1);},wheelChange:function(evt,deltaZ){var currentZoom=this.map.getZoom();var newZoom=this.map.getZoom()+Math.round(deltaZ);newZoom=Math.max(newZoom,0);newZoom=Math.min(newZoom,this.map.getNumZoomLevels());if(newZoom===currentZoom){return;} +var size=this.map.getSize();var deltaX=size.w/2-evt.xy.x;var deltaY=evt.xy.y-size.h/2;var newRes=this.map.baseLayer.getResolutionForZoom(newZoom);var zoomPoint=this.map.getLonLatFromPixel(evt.xy);var newCenter=new OpenLayers.LonLat(zoomPoint.lon+deltaX*newRes,zoomPoint.lat+deltaY*newRes);this.map.setCenter(newCenter,newZoom);},wheelUp:function(evt,delta){this.wheelChange(evt,delta||1);},wheelDown:function(evt,delta){this.wheelChange(evt,delta||-1);},disableZoomBox:function(){this.zoomBoxEnabled=false;this.zoomBox.deactivate();},enableZoomBox:function(){this.zoomBoxEnabled=true;if(this.active){this.zoomBox.activate();}},disableZoomWheel:function(){this.zoomWheelEnabled=false;this.handlers.wheel.deactivate();},enableZoomWheel:function(){this.zoomWheelEnabled=true;if(this.active){this.handlers.wheel.activate();}},CLASS_NAME:"OpenLayers.Control.Navigation"});OpenLayers.Layer.HTTPRequest=OpenLayers.Class(OpenLayers.Layer,{URL_HASH_FACTOR:(Math.sqrt(5)-1)/2,url:null,params:null,reproject:false,initialize:function(name,url,params,options){OpenLayers.Layer.prototype.initialize.apply(this,[name,options]);this.url=url;this.params=OpenLayers.Util.extend({},params);},destroy:function(){this.url=null;this.params=null;OpenLayers.Layer.prototype.destroy.apply(this,arguments);},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.HTTPRequest(this.name,this.url,this.params,this.getOptions());} +obj=OpenLayers.Layer.prototype.clone.apply(this,[obj]);return obj;},setUrl:function(newUrl){this.url=newUrl;},mergeNewParams:function(newParams){this.params=OpenLayers.Util.extend(this.params,newParams);var ret=this.redraw();if(this.map!=null){this.map.events.triggerEvent("changelayer",{layer:this,property:"params"});} +return ret;},redraw:function(force){if(force){return this.mergeNewParams({"_olSalt":Math.random()});}else{return OpenLayers.Layer.prototype.redraw.apply(this,[]);}},selectUrl:function(paramString,urls){var product=1;for(var i=0,len=paramString.length;i<len;i++){product*=paramString.charCodeAt(i)*this.URL_HASH_FACTOR;product-=Math.floor(product);} +return urls[Math.floor(product*urls.length)];},getFullRequestString:function(newParams,altUrl){var url=altUrl||this.url;var allParams=OpenLayers.Util.extend({},this.params);allParams=OpenLayers.Util.extend(allParams,newParams);var paramsString=OpenLayers.Util.getParameterString(allParams);if(OpenLayers.Util.isArray(url)){url=this.selectUrl(paramsString,url);} +var urlParams=OpenLayers.Util.upperCaseObject(OpenLayers.Util.getParameters(url));for(var key in allParams){if(key.toUpperCase()in urlParams){delete allParams[key];}} +paramsString=OpenLayers.Util.getParameterString(allParams);return OpenLayers.Util.urlAppend(url,paramsString);},CLASS_NAME:"OpenLayers.Layer.HTTPRequest"});OpenLayers.Layer.Grid=OpenLayers.Class(OpenLayers.Layer.HTTPRequest,{tileSize:null,tileOriginCorner:"bl",tileOrigin:null,tileOptions:null,grid:null,singleTile:false,ratio:1.5,buffer:0,numLoadingTiles:0,tileLoadingDelay:100,timerId:null,initialize:function(name,url,params,options){OpenLayers.Layer.HTTPRequest.prototype.initialize.apply(this,arguments);this.events.addEventType("tileloaded");this.grid=[];this._moveGriddedTiles=OpenLayers.Function.bind(this.moveGriddedTiles,this);},removeMap:function(map){if(this.timerId!=null){window.clearTimeout(this.timerId);this.timerId=null;}},destroy:function(){this.clearGrid();this.grid=null;this.tileSize=null;OpenLayers.Layer.HTTPRequest.prototype.destroy.apply(this,arguments);},clearGrid:function(){if(this.grid){for(var iRow=0,len=this.grid.length;iRow<len;iRow++){var row=this.grid[iRow];for(var iCol=0,clen=row.length;iCol<clen;iCol++){var tile=row[iCol];this.removeTileMonitoringHooks(tile);tile.destroy();}} +this.grid=[];}},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.Grid(this.name,this.url,this.params,this.getOptions());} +obj=OpenLayers.Layer.HTTPRequest.prototype.clone.apply(this,[obj]);if(this.tileSize!=null){obj.tileSize=this.tileSize.clone();} +obj.grid=[];return obj;},moveTo:function(bounds,zoomChanged,dragging){OpenLayers.Layer.HTTPRequest.prototype.moveTo.apply(this,arguments);bounds=bounds||this.map.getExtent();if(bounds!=null){var forceReTile=!this.grid.length||zoomChanged;var tilesBounds=this.getTilesBounds();if(this.singleTile){if(forceReTile||(!dragging&&!tilesBounds.containsBounds(bounds))){this.initSingleTile(bounds);}}else{if(forceReTile||!tilesBounds.containsBounds(bounds,true)){this.initGriddedTiles(bounds);}else{this.scheduleMoveGriddedTiles();}}}},moveByPx:function(dx,dy){if(!this.singleTile){this.scheduleMoveGriddedTiles();}},scheduleMoveGriddedTiles:function(){if(this.timerId!=null){window.clearTimeout(this.timerId);} +this.timerId=window.setTimeout(this._moveGriddedTiles,this.tileLoadingDelay);},setTileSize:function(size){if(this.singleTile){size=this.map.getSize();size.h=parseInt(size.h*this.ratio);size.w=parseInt(size.w*this.ratio);} +OpenLayers.Layer.HTTPRequest.prototype.setTileSize.apply(this,[size]);},getGridBounds:function(){var msg="The getGridBounds() function is deprecated. It will be "+"removed in 3.0. Please use getTilesBounds() instead.";OpenLayers.Console.warn(msg);return this.getTilesBounds();},getTilesBounds:function(){var bounds=null;if(this.grid.length){var bottom=this.grid.length-1;var bottomLeftTile=this.grid[bottom][0];var right=this.grid[0].length-1;var topRightTile=this.grid[0][right];bounds=new OpenLayers.Bounds(bottomLeftTile.bounds.left,bottomLeftTile.bounds.bottom,topRightTile.bounds.right,topRightTile.bounds.top);} +return bounds;},initSingleTile:function(bounds){var center=bounds.getCenterLonLat();var tileWidth=bounds.getWidth()*this.ratio;var tileHeight=bounds.getHeight()*this.ratio;var tileBounds=new OpenLayers.Bounds(center.lon-(tileWidth/2),center.lat-(tileHeight/2),center.lon+(tileWidth/2),center.lat+(tileHeight/2));var ul=new OpenLayers.LonLat(tileBounds.left,tileBounds.top);var px=this.map.getLayerPxFromLonLat(ul);if(!this.grid.length){this.grid[0]=[];} +var tile=this.grid[0][0];if(!tile){tile=this.addTile(tileBounds,px);this.addTileMonitoringHooks(tile);tile.draw();this.grid[0][0]=tile;}else{tile.moveTo(tileBounds,px);} +this.removeExcessTiles(1,1);},calculateGridLayout:function(bounds,origin,resolution){var tilelon=resolution*this.tileSize.w;var tilelat=resolution*this.tileSize.h;var offsetlon=bounds.left-origin.lon;var tilecol=Math.floor(offsetlon/tilelon)-this.buffer;var tilecolremain=offsetlon/tilelon-tilecol;var tileoffsetx=-tilecolremain*this.tileSize.w;var tileoffsetlon=origin.lon+tilecol*tilelon;var offsetlat=bounds.top-(origin.lat+tilelat);var tilerow=Math.ceil(offsetlat/tilelat)+this.buffer;var tilerowremain=tilerow-offsetlat/tilelat;var tileoffsety=-tilerowremain*this.tileSize.h;var tileoffsetlat=origin.lat+tilerow*tilelat;return{tilelon:tilelon,tilelat:tilelat,tileoffsetlon:tileoffsetlon,tileoffsetlat:tileoffsetlat,tileoffsetx:tileoffsetx,tileoffsety:tileoffsety};},getTileOrigin:function(){var origin=this.tileOrigin;if(!origin){var extent=this.getMaxExtent();var edges=({"tl":["left","top"],"tr":["right","top"],"bl":["left","bottom"],"br":["right","bottom"]})[this.tileOriginCorner];origin=new OpenLayers.LonLat(extent[edges[0]],extent[edges[1]]);} +return origin;},initGriddedTiles:function(bounds){var viewSize=this.map.getSize();var minRows=Math.ceil(viewSize.h/this.tileSize.h)+ +Math.max(1,2*this.buffer);var minCols=Math.ceil(viewSize.w/this.tileSize.w)+ +Math.max(1,2*this.buffer);var origin=this.getTileOrigin();var resolution=this.map.getResolution();var tileLayout=this.calculateGridLayout(bounds,origin,resolution);var tileoffsetx=Math.round(tileLayout.tileoffsetx);var tileoffsety=Math.round(tileLayout.tileoffsety);var tileoffsetlon=tileLayout.tileoffsetlon;var tileoffsetlat=tileLayout.tileoffsetlat;var tilelon=tileLayout.tilelon;var tilelat=tileLayout.tilelat;this.origin=new OpenLayers.Pixel(tileoffsetx,tileoffsety);var startX=tileoffsetx;var startLon=tileoffsetlon;var rowidx=0;var layerContainerDivLeft=parseInt(this.map.layerContainerDiv.style.left);var layerContainerDivTop=parseInt(this.map.layerContainerDiv.style.top);do{var row=this.grid[rowidx++];if(!row){row=[];this.grid.push(row);} +tileoffsetlon=startLon;tileoffsetx=startX;var colidx=0;do{var tileBounds=new OpenLayers.Bounds(tileoffsetlon,tileoffsetlat,tileoffsetlon+tilelon,tileoffsetlat+tilelat);var x=tileoffsetx;x-=layerContainerDivLeft;var y=tileoffsety;y-=layerContainerDivTop;var px=new OpenLayers.Pixel(x,y);var tile=row[colidx++];if(!tile){tile=this.addTile(tileBounds,px);this.addTileMonitoringHooks(tile);row.push(tile);}else{tile.moveTo(tileBounds,px,false);} +tileoffsetlon+=tilelon;tileoffsetx+=this.tileSize.w;}while((tileoffsetlon<=bounds.right+tilelon*this.buffer)||colidx<minCols);tileoffsetlat-=tilelat;tileoffsety+=this.tileSize.h;}while((tileoffsetlat>=bounds.bottom-tilelat*this.buffer)||rowidx<minRows);this.removeExcessTiles(rowidx,colidx);this.spiralTileLoad();},getMaxExtent:function(){return this.maxExtent;},spiralTileLoad:function(){var tileQueue=[];var directions=["right","down","left","up"];var iRow=0;var iCell=-1;var direction=OpenLayers.Util.indexOf(directions,"right");var directionsTried=0;while(directionsTried<directions.length){var testRow=iRow;var testCell=iCell;switch(directions[direction]){case"right":testCell++;break;case"down":testRow++;break;case"left":testCell--;break;case"up":testRow--;break;} +var tile=null;if((testRow<this.grid.length)&&(testRow>=0)&&(testCell<this.grid[0].length)&&(testCell>=0)){tile=this.grid[testRow][testCell];} +if((tile!=null)&&(!tile.queued)){tileQueue.unshift(tile);tile.queued=true;directionsTried=0;iRow=testRow;iCell=testCell;}else{direction=(direction+1)%4;directionsTried++;}} +for(var i=0,len=tileQueue.length;i<len;i++){var tile=tileQueue[i];tile.draw();tile.queued=false;}},addTile:function(bounds,position){return new OpenLayers.Tile.Image(this,position,bounds,null,this.tileSize,this.tileOptions);},addTileMonitoringHooks:function(tile){tile.onLoadStart=function(){if(this.numLoadingTiles==0){this.events.triggerEvent("loadstart");} +this.numLoadingTiles++;};tile.events.register("loadstart",this,tile.onLoadStart);tile.onLoadEnd=function(){this.numLoadingTiles--;this.events.triggerEvent("tileloaded");if(this.numLoadingTiles==0){this.events.triggerEvent("loadend");}};tile.events.register("loadend",this,tile.onLoadEnd);tile.events.register("unload",this,tile.onLoadEnd);},removeTileMonitoringHooks:function(tile){tile.unload();tile.events.un({"loadstart":tile.onLoadStart,"loadend":tile.onLoadEnd,"unload":tile.onLoadEnd,scope:this});},moveGriddedTiles:function(){var shifted=true;var buffer=this.buffer||1;var tlLayer=this.grid[0][0].position;var offsetX=parseInt(this.map.layerContainerDiv.style.left);var offsetY=parseInt(this.map.layerContainerDiv.style.top);var tlViewPort=tlLayer.add(offsetX,offsetY);if(tlViewPort.x>-this.tileSize.w*(buffer-1)){this.shiftColumn(true);}else if(tlViewPort.x<-this.tileSize.w*buffer){this.shiftColumn(false);}else if(tlViewPort.y>-this.tileSize.h*(buffer-1)){this.shiftRow(true);}else if(tlViewPort.y<-this.tileSize.h*buffer){this.shiftRow(false);}else{shifted=false;} +if(shifted){this.timerId=window.setTimeout(this._moveGriddedTiles,0);}},shiftRow:function(prepend){var modelRowIndex=(prepend)?0:(this.grid.length-1);var grid=this.grid;var modelRow=grid[modelRowIndex];var resolution=this.map.getResolution();var deltaY=(prepend)?-this.tileSize.h:this.tileSize.h;var deltaLat=resolution*-deltaY;var row=(prepend)?grid.pop():grid.shift();for(var i=0,len=modelRow.length;i<len;i++){var modelTile=modelRow[i];var bounds=modelTile.bounds.clone();var position=modelTile.position.clone();bounds.bottom=bounds.bottom+deltaLat;bounds.top=bounds.top+deltaLat;position.y=position.y+deltaY;row[i].moveTo(bounds,position);} +if(prepend){grid.unshift(row);}else{grid.push(row);}},shiftColumn:function(prepend){var deltaX=(prepend)?-this.tileSize.w:this.tileSize.w;var resolution=this.map.getResolution();var deltaLon=resolution*deltaX;for(var i=0,len=this.grid.length;i<len;i++){var row=this.grid[i];var modelTileIndex=(prepend)?0:(row.length-1);var modelTile=row[modelTileIndex];var bounds=modelTile.bounds.clone();var position=modelTile.position.clone();bounds.left=bounds.left+deltaLon;bounds.right=bounds.right+deltaLon;position.x=position.x+deltaX;var tile=prepend?this.grid[i].pop():this.grid[i].shift();tile.moveTo(bounds,position);if(prepend){row.unshift(tile);}else{row.push(tile);}}},removeExcessTiles:function(rows,columns){while(this.grid.length>rows){var row=this.grid.pop();for(var i=0,l=row.length;i<l;i++){var tile=row[i];this.removeTileMonitoringHooks(tile);tile.destroy();}} +while(this.grid[0].length>columns){for(var i=0,l=this.grid.length;i<l;i++){var row=this.grid[i];var tile=row.pop();this.removeTileMonitoringHooks(tile);tile.destroy();}}},onMapResize:function(){if(this.singleTile){this.clearGrid();this.setTileSize();}},getTileBounds:function(viewPortPx){var maxExtent=this.maxExtent;var resolution=this.getResolution();var tileMapWidth=resolution*this.tileSize.w;var tileMapHeight=resolution*this.tileSize.h;var mapPoint=this.getLonLatFromViewPortPx(viewPortPx);var tileLeft=maxExtent.left+(tileMapWidth*Math.floor((mapPoint.lon- +maxExtent.left)/tileMapWidth));var tileBottom=maxExtent.bottom+(tileMapHeight*Math.floor((mapPoint.lat- +maxExtent.bottom)/tileMapHeight));return new OpenLayers.Bounds(tileLeft,tileBottom,tileLeft+tileMapWidth,tileBottom+tileMapHeight);},CLASS_NAME:"OpenLayers.Layer.Grid"});OpenLayers.Layer.XYZ=OpenLayers.Class(OpenLayers.Layer.Grid,{isBaseLayer:true,sphericalMercator:false,zoomOffset:0,serverResolutions:null,initialize:function(name,url,options){if(options&&options.sphericalMercator||this.sphericalMercator){options=OpenLayers.Util.extend({maxExtent:new OpenLayers.Bounds(-128*156543.03390625,-128*156543.03390625,128*156543.03390625,128*156543.03390625),maxResolution:156543.03390625,numZoomLevels:19,units:"m",projection:"EPSG:900913"},options);} +url=url||this.url;name=name||this.name;var newArguments=[name,url,{},options];OpenLayers.Layer.Grid.prototype.initialize.apply(this,newArguments);},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.XYZ(this.name,this.url,this.getOptions());} +obj=OpenLayers.Layer.Grid.prototype.clone.apply(this,[obj]);return obj;},getURL:function(bounds){var xyz=this.getXYZ(bounds);var url=this.url;if(OpenLayers.Util.isArray(url)){var s=''+xyz.x+xyz.y+xyz.z;url=this.selectUrl(s,url);} +return OpenLayers.String.format(url,xyz);},getXYZ:function(bounds){var res=this.map.getResolution();var x=Math.round((bounds.left-this.maxExtent.left)/(res*this.tileSize.w));var y=Math.round((this.maxExtent.top-bounds.top)/(res*this.tileSize.h));var z=this.serverResolutions!=null?OpenLayers.Util.indexOf(this.serverResolutions,res):this.map.getZoom()+this.zoomOffset;var limit=Math.pow(2,z);if(this.wrapDateLine) +{x=((x%limit)+limit)%limit;} +return{'x':x,'y':y,'z':z};},setMap:function(map){OpenLayers.Layer.Grid.prototype.setMap.apply(this,arguments);if(!this.tileOrigin){this.tileOrigin=new OpenLayers.LonLat(this.maxExtent.left,this.maxExtent.bottom);}},CLASS_NAME:"OpenLayers.Layer.XYZ"});OpenLayers.Layer.OSM=OpenLayers.Class(OpenLayers.Layer.XYZ,{name:"OpenStreetMap",attribution:"Data CC-By-SA by <a href='http://openstreetmap.org/'>OpenStreetMap</a>",sphericalMercator:true,url:'http://tile.openstreetmap.org/${z}/${x}/${y}.png',clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.OSM(this.name,this.url,this.getOptions());} +obj=OpenLayers.Layer.XYZ.prototype.clone.apply(this,[obj]);return obj;},wrapDateLine:true,CLASS_NAME:"OpenLayers.Layer.OSM"});OpenLayers.Renderer.SVG=OpenLayers.Class(OpenLayers.Renderer.Elements,{xmlns:"http://www.w3.org/2000/svg",xlinkns:"http://www.w3.org/1999/xlink",MAX_PIXEL:15000,translationParameters:null,symbolMetrics:null,initialize:function(containerID){if(!this.supported()){return;} +OpenLayers.Renderer.Elements.prototype.initialize.apply(this,arguments);this.translationParameters={x:0,y:0};this.symbolMetrics={};},supported:function(){var svgFeature="http://www.w3.org/TR/SVG11/feature#";return(document.implementation&&(document.implementation.hasFeature("org.w3c.svg","1.0")||document.implementation.hasFeature(svgFeature+"SVG","1.1")||document.implementation.hasFeature(svgFeature+"BasicStructure","1.1")));},inValidRange:function(x,y,xyOnly){var left=x+(xyOnly?0:this.translationParameters.x);var top=y+(xyOnly?0:this.translationParameters.y);return(left>=-this.MAX_PIXEL&&left<=this.MAX_PIXEL&&top>=-this.MAX_PIXEL&&top<=this.MAX_PIXEL);},setExtent:function(extent,resolutionChanged){OpenLayers.Renderer.Elements.prototype.setExtent.apply(this,arguments);var resolution=this.getResolution();var left=-extent.left/resolution;var top=extent.top/resolution;if(resolutionChanged){this.left=left;this.top=top;var extentString="0 0 "+this.size.w+" "+this.size.h;this.rendererRoot.setAttributeNS(null,"viewBox",extentString);this.translate(0,0);return true;}else{var inRange=this.translate(left-this.left,top-this.top);if(!inRange){this.setExtent(extent,true);} +return inRange;}},translate:function(x,y){if(!this.inValidRange(x,y,true)){return false;}else{var transformString="";if(x||y){transformString="translate("+x+","+y+")";} +this.root.setAttributeNS(null,"transform",transformString);this.translationParameters={x:x,y:y};return true;}},setSize:function(size){OpenLayers.Renderer.prototype.setSize.apply(this,arguments);this.rendererRoot.setAttributeNS(null,"width",this.size.w);this.rendererRoot.setAttributeNS(null,"height",this.size.h);},getNodeType:function(geometry,style){var nodeType=null;switch(geometry.CLASS_NAME){case"OpenLayers.Geometry.Point":if(style.externalGraphic){nodeType="image";}else if(this.isComplexSymbol(style.graphicName)){nodeType="svg";}else{nodeType="circle";} +break;case"OpenLayers.Geometry.Rectangle":nodeType="rect";break;case"OpenLayers.Geometry.LineString":nodeType="polyline";break;case"OpenLayers.Geometry.LinearRing":nodeType="polygon";break;case"OpenLayers.Geometry.Polygon":case"OpenLayers.Geometry.Curve":case"OpenLayers.Geometry.Surface":nodeType="path";break;default:break;} +return nodeType;},setStyle:function(node,style,options){style=style||node._style;options=options||node._options;var r=parseFloat(node.getAttributeNS(null,"r"));var widthFactor=1;var pos;if(node._geometryClass=="OpenLayers.Geometry.Point"&&r){node.style.visibility="";if(style.graphic===false){node.style.visibility="hidden";}else if(style.externalGraphic){pos=this.getPosition(node);if(style.graphicTitle){node.setAttributeNS(null,"title",style.graphicTitle);var label=this.nodeFactory(null,"title");label.textContent=style.graphicTitle;node.appendChild(label);} +if(style.graphicWidth&&style.graphicHeight){node.setAttributeNS(null,"preserveAspectRatio","none");} +var width=style.graphicWidth||style.graphicHeight;var height=style.graphicHeight||style.graphicWidth;width=width?width:style.pointRadius*2;height=height?height:style.pointRadius*2;var xOffset=(style.graphicXOffset!=undefined)?style.graphicXOffset:-(0.5*width);var yOffset=(style.graphicYOffset!=undefined)?style.graphicYOffset:-(0.5*height);var opacity=style.graphicOpacity||style.fillOpacity;node.setAttributeNS(null,"x",(pos.x+xOffset).toFixed());node.setAttributeNS(null,"y",(pos.y+yOffset).toFixed());node.setAttributeNS(null,"width",width);node.setAttributeNS(null,"height",height);node.setAttributeNS(this.xlinkns,"href",style.externalGraphic);node.setAttributeNS(null,"style","opacity: "+opacity);node.onclick=OpenLayers.Renderer.SVG.preventDefault;}else if(this.isComplexSymbol(style.graphicName)){var offset=style.pointRadius*3;var size=offset*2;var src=this.importSymbol(style.graphicName);pos=this.getPosition(node);widthFactor=this.symbolMetrics[src.id][0]*3/size;var parent=node.parentNode;var nextSibling=node.nextSibling;if(parent){parent.removeChild(node);} +node.firstChild&&node.removeChild(node.firstChild);node.appendChild(src.firstChild.cloneNode(true));node.setAttributeNS(null,"viewBox",src.getAttributeNS(null,"viewBox"));node.setAttributeNS(null,"width",size);node.setAttributeNS(null,"height",size);node.setAttributeNS(null,"x",pos.x-offset);node.setAttributeNS(null,"y",pos.y-offset);if(nextSibling){parent.insertBefore(node,nextSibling);}else if(parent){parent.appendChild(node);}}else{node.setAttributeNS(null,"r",style.pointRadius);} +var rotation=style.rotation;if((rotation!==undefined||node._rotation!==undefined)&&pos){node._rotation=rotation;rotation|=0;if(node.nodeName!=="svg"){node.setAttributeNS(null,"transform","rotate("+rotation+" "+pos.x+" "+ +pos.y+")");}else{var metrics=this.symbolMetrics[src.id];node.firstChild.setAttributeNS(null,"transform","rotate(" ++rotation+" " ++metrics[1]+" " ++metrics[2]+")");}}} +if(options.isFilled){node.setAttributeNS(null,"fill",style.fillColor);node.setAttributeNS(null,"fill-opacity",style.fillOpacity);}else{node.setAttributeNS(null,"fill","none");} +if(options.isStroked){node.setAttributeNS(null,"stroke",style.strokeColor);node.setAttributeNS(null,"stroke-opacity",style.strokeOpacity);node.setAttributeNS(null,"stroke-width",style.strokeWidth*widthFactor);node.setAttributeNS(null,"stroke-linecap",style.strokeLinecap||"round");node.setAttributeNS(null,"stroke-linejoin","round");style.strokeDashstyle&&node.setAttributeNS(null,"stroke-dasharray",this.dashStyle(style,widthFactor));}else{node.setAttributeNS(null,"stroke","none");} +if(style.pointerEvents){node.setAttributeNS(null,"pointer-events",style.pointerEvents);} +if(style.cursor!=null){node.setAttributeNS(null,"cursor",style.cursor);} +return node;},dashStyle:function(style,widthFactor){var w=style.strokeWidth*widthFactor;var str=style.strokeDashstyle;switch(str){case'solid':return'none';case'dot':return[1,4*w].join();case'dash':return[4*w,4*w].join();case'dashdot':return[4*w,4*w,1,4*w].join();case'longdash':return[8*w,4*w].join();case'longdashdot':return[8*w,4*w,1,4*w].join();default:return OpenLayers.String.trim(str).replace(/\s+/g,",");}},createNode:function(type,id){var node=document.createElementNS(this.xmlns,type);if(id){node.setAttributeNS(null,"id",id);} +return node;},nodeTypeCompare:function(node,type){return(type==node.nodeName);},createRenderRoot:function(){return this.nodeFactory(this.container.id+"_svgRoot","svg");},createRoot:function(suffix){return this.nodeFactory(this.container.id+suffix,"g");},createDefs:function(){var defs=this.nodeFactory(this.container.id+"_defs","defs");this.rendererRoot.appendChild(defs);return defs;},drawPoint:function(node,geometry){return this.drawCircle(node,geometry,1);},drawCircle:function(node,geometry,radius){var resolution=this.getResolution();var x=(geometry.x/resolution+this.left);var y=(this.top-geometry.y/resolution);if(this.inValidRange(x,y)){node.setAttributeNS(null,"cx",x);node.setAttributeNS(null,"cy",y);node.setAttributeNS(null,"r",radius);return node;}else{return false;}},drawLineString:function(node,geometry){var componentsResult=this.getComponentsString(geometry.components);if(componentsResult.path){node.setAttributeNS(null,"points",componentsResult.path);return(componentsResult.complete?node:null);}else{return false;}},drawLinearRing:function(node,geometry){var componentsResult=this.getComponentsString(geometry.components);if(componentsResult.path){node.setAttributeNS(null,"points",componentsResult.path);return(componentsResult.complete?node:null);}else{return false;}},drawPolygon:function(node,geometry){var d="";var draw=true;var complete=true;var linearRingResult,path;for(var j=0,len=geometry.components.length;j<len;j++){d+=" M";linearRingResult=this.getComponentsString(geometry.components[j].components," ");path=linearRingResult.path;if(path){d+=" "+path;complete=linearRingResult.complete&&complete;}else{draw=false;}} +d+=" z";if(draw){node.setAttributeNS(null,"d",d);node.setAttributeNS(null,"fill-rule","evenodd");return complete?node:null;}else{return false;}},drawRectangle:function(node,geometry){var resolution=this.getResolution();var x=(geometry.x/resolution+this.left);var y=(this.top-geometry.y/resolution);if(this.inValidRange(x,y)){node.setAttributeNS(null,"x",x);node.setAttributeNS(null,"y",y);node.setAttributeNS(null,"width",geometry.width/resolution);node.setAttributeNS(null,"height",geometry.height/resolution);return node;}else{return false;}},drawSurface:function(node,geometry){var d=null;var draw=true;for(var i=0,len=geometry.components.length;i<len;i++){if((i%3)==0&&(i/3)==0){var component=this.getShortString(geometry.components[i]);if(!component){draw=false;} +d="M "+component;}else if((i%3)==1){var component=this.getShortString(geometry.components[i]);if(!component){draw=false;} +d+=" C "+component;}else{var component=this.getShortString(geometry.components[i]);if(!component){draw=false;} +d+=" "+component;}} +d+=" Z";if(draw){node.setAttributeNS(null,"d",d);return node;}else{return false;}},drawText:function(featureId,style,location){var resolution=this.getResolution();var x=(location.x/resolution+this.left);var y=(location.y/resolution-this.top);var label=this.nodeFactory(featureId+this.LABEL_ID_SUFFIX,"text");label.setAttributeNS(null,"x",x);label.setAttributeNS(null,"y",-y);if(style.fontColor){label.setAttributeNS(null,"fill",style.fontColor);} +if(style.fontOpacity){label.setAttributeNS(null,"opacity",style.fontOpacity);} +if(style.fontFamily){label.setAttributeNS(null,"font-family",style.fontFamily);} +if(style.fontSize){label.setAttributeNS(null,"font-size",style.fontSize);} +if(style.fontWeight){label.setAttributeNS(null,"font-weight",style.fontWeight);} +if(style.fontStyle){label.setAttributeNS(null,"font-style",style.fontStyle);} +if(style.labelSelect===true){label.setAttributeNS(null,"pointer-events","visible");label._featureId=featureId;}else{label.setAttributeNS(null,"pointer-events","none");} +var align=style.labelAlign||"cm";label.setAttributeNS(null,"text-anchor",OpenLayers.Renderer.SVG.LABEL_ALIGN[align[0]]||"middle");if(OpenLayers.IS_GECKO===true){label.setAttributeNS(null,"dominant-baseline",OpenLayers.Renderer.SVG.LABEL_ALIGN[align[1]]||"central");} +var labelRows=style.label.split('\n');var numRows=labelRows.length;while(label.childNodes.length>numRows){label.removeChild(label.lastChild);} +for(var i=0;i<numRows;i++){var tspan=this.nodeFactory(featureId+this.LABEL_ID_SUFFIX+"_tspan_"+i,"tspan");if(style.labelSelect===true){tspan._featureId=featureId;tspan._geometry=location;tspan._geometryClass=location.CLASS_NAME;} +if(OpenLayers.IS_GECKO===false){tspan.setAttributeNS(null,"baseline-shift",OpenLayers.Renderer.SVG.LABEL_VSHIFT[align[1]]||"-35%");} +tspan.setAttribute("x",x);if(i==0){var vfactor=OpenLayers.Renderer.SVG.LABEL_VFACTOR[align[1]];if(vfactor==null){vfactor=-.5;} +tspan.setAttribute("dy",(vfactor*(numRows-1))+"em");}else{tspan.setAttribute("dy","1em");} +tspan.textContent=(labelRows[i]==='')?' ':labelRows[i];if(!tspan.parentNode){label.appendChild(tspan);}} +if(!label.parentNode){this.textRoot.appendChild(label);}},getComponentsString:function(components,separator){var renderCmp=[];var complete=true;var len=components.length;var strings=[];var str,component;for(var i=0;i<len;i++){component=components[i];renderCmp.push(component);str=this.getShortString(component);if(str){strings.push(str);}else{if(i>0){if(this.getShortString(components[i-1])){strings.push(this.clipLine(components[i],components[i-1]));}} +if(i<len-1){if(this.getShortString(components[i+1])){strings.push(this.clipLine(components[i],components[i+1]));}} +complete=false;}} +return{path:strings.join(separator||","),complete:complete};},clipLine:function(badComponent,goodComponent){if(goodComponent.equals(badComponent)){return"";} +var resolution=this.getResolution();var maxX=this.MAX_PIXEL-this.translationParameters.x;var maxY=this.MAX_PIXEL-this.translationParameters.y;var x1=goodComponent.x/resolution+this.left;var y1=this.top-goodComponent.y/resolution;var x2=badComponent.x/resolution+this.left;var y2=this.top-badComponent.y/resolution;var k;if(x2<-maxX||x2>maxX){k=(y2-y1)/(x2-x1);x2=x2<0?-maxX:maxX;y2=y1+(x2-x1)*k;} +if(y2<-maxY||y2>maxY){k=(x2-x1)/(y2-y1);y2=y2<0?-maxY:maxY;x2=x1+(y2-y1)*k;} +return x2+","+y2;},getShortString:function(point){var resolution=this.getResolution();var x=(point.x/resolution+this.left);var y=(this.top-point.y/resolution);if(this.inValidRange(x,y)){return x+","+y;}else{return false;}},getPosition:function(node){return({x:parseFloat(node.getAttributeNS(null,"cx")),y:parseFloat(node.getAttributeNS(null,"cy"))});},importSymbol:function(graphicName){if(!this.defs){this.defs=this.createDefs();} +var id=this.container.id+"-"+graphicName;var existing=document.getElementById(id) +if(existing!=null){return existing;} +var symbol=OpenLayers.Renderer.symbol[graphicName];if(!symbol){throw new Error(graphicName+' is not a valid symbol name');} +var symbolNode=this.nodeFactory(id,"symbol");var node=this.nodeFactory(null,"polygon");symbolNode.appendChild(node);var symbolExtent=new OpenLayers.Bounds(Number.MAX_VALUE,Number.MAX_VALUE,0,0);var points=[];var x,y;for(var i=0;i<symbol.length;i=i+2){x=symbol[i];y=symbol[i+1];symbolExtent.left=Math.min(symbolExtent.left,x);symbolExtent.bottom=Math.min(symbolExtent.bottom,y);symbolExtent.right=Math.max(symbolExtent.right,x);symbolExtent.top=Math.max(symbolExtent.top,y);points.push(x,",",y);} +node.setAttributeNS(null,"points",points.join(" "));var width=symbolExtent.getWidth();var height=symbolExtent.getHeight();var viewBox=[symbolExtent.left-width,symbolExtent.bottom-height,width*3,height*3];symbolNode.setAttributeNS(null,"viewBox",viewBox.join(" "));this.symbolMetrics[id]=[Math.max(width,height),symbolExtent.getCenterLonLat().lon,symbolExtent.getCenterLonLat().lat];this.defs.appendChild(symbolNode);return symbolNode;},getFeatureIdFromEvent:function(evt){var featureId=OpenLayers.Renderer.Elements.prototype.getFeatureIdFromEvent.apply(this,arguments);if(!featureId){var target=evt.target;featureId=target.parentNode&&target!=this.rendererRoot&&target.parentNode._featureId;} +return featureId;},CLASS_NAME:"OpenLayers.Renderer.SVG"});OpenLayers.Renderer.SVG.LABEL_ALIGN={"l":"start","r":"end","b":"bottom","t":"hanging"};OpenLayers.Renderer.SVG.LABEL_VSHIFT={"t":"-70%","b":"0"};OpenLayers.Renderer.SVG.LABEL_VFACTOR={"t":0,"b":-1};OpenLayers.Renderer.SVG.preventDefault=function(e){e.preventDefault&&e.preventDefault();};OpenLayers.Control.PanZoom=OpenLayers.Class(OpenLayers.Control,{slideFactor:50,slideRatio:null,buttons:null,position:null,initialize:function(options){this.position=new OpenLayers.Pixel(OpenLayers.Control.PanZoom.X,OpenLayers.Control.PanZoom.Y);OpenLayers.Control.prototype.initialize.apply(this,arguments);},destroy:function(){this.removeButtons();this.buttons=null;this.position=null;OpenLayers.Control.prototype.destroy.apply(this,arguments);},draw:function(px){OpenLayers.Control.prototype.draw.apply(this,arguments);px=this.position;this.buttons=[];var sz=new OpenLayers.Size(18,18);var centered=new OpenLayers.Pixel(px.x+sz.w/2,px.y);this._addButton("panup","north-mini.png",centered,sz);px.y=centered.y+sz.h;this._addButton("panleft","west-mini.png",px,sz);this._addButton("panright","east-mini.png",px.add(sz.w,0),sz);this._addButton("pandown","south-mini.png",centered.add(0,sz.h*2),sz);this._addButton("zoomin","zoom-plus-mini.png",centered.add(0,sz.h*3+5),sz);this._addButton("zoomworld","zoom-world-mini.png",centered.add(0,sz.h*4+5),sz);this._addButton("zoomout","zoom-minus-mini.png",centered.add(0,sz.h*5+5),sz);return this.div;},_addButton:function(id,img,xy,sz){var imgLocation=OpenLayers.Util.getImagesLocation()+img;var btn=OpenLayers.Util.createAlphaImageDiv(this.id+"_"+id,xy,sz,imgLocation,"absolute");btn.style.cursor="pointer";this.div.appendChild(btn);OpenLayers.Event.observe(btn,"mousedown",OpenLayers.Function.bindAsEventListener(this.buttonDown,btn));OpenLayers.Event.observe(btn,"dblclick",OpenLayers.Function.bindAsEventListener(this.doubleClick,btn));OpenLayers.Event.observe(btn,"click",OpenLayers.Function.bindAsEventListener(this.doubleClick,btn));btn.action=id;btn.map=this.map;if(!this.slideRatio){var slideFactorPixels=this.slideFactor;var getSlideFactor=function(){return slideFactorPixels;};}else{var slideRatio=this.slideRatio;var getSlideFactor=function(dim){return this.map.getSize()[dim]*slideRatio;};} +btn.getSlideFactor=getSlideFactor;this.buttons.push(btn);return btn;},_removeButton:function(btn){OpenLayers.Event.stopObservingElement(btn);btn.map=null;btn.getSlideFactor=null;this.div.removeChild(btn);OpenLayers.Util.removeItem(this.buttons,btn);},removeButtons:function(){for(var i=this.buttons.length-1;i>=0;--i){this._removeButton(this.buttons[i]);}},doubleClick:function(evt){OpenLayers.Event.stop(evt);return false;},buttonDown:function(evt){if(!OpenLayers.Event.isLeftClick(evt)){return;} +switch(this.action){case"panup":this.map.pan(0,-this.getSlideFactor("h"));break;case"pandown":this.map.pan(0,this.getSlideFactor("h"));break;case"panleft":this.map.pan(-this.getSlideFactor("w"),0);break;case"panright":this.map.pan(this.getSlideFactor("w"),0);break;case"zoomin":this.map.zoomIn();break;case"zoomout":this.map.zoomOut();break;case"zoomworld":this.map.zoomToMaxExtent();break;} +OpenLayers.Event.stop(evt);},CLASS_NAME:"OpenLayers.Control.PanZoom"});OpenLayers.Control.PanZoom.X=4;OpenLayers.Control.PanZoom.Y=4;OpenLayers.Format.WMTSCapabilities=OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC,{defaultVersion:"1.0.0",yx:{"urn:ogc:def:crs:EPSG::4326":true},createLayer:function(capabilities,config){var layer;var required={layer:true,matrixSet:true};for(var prop in required){if(!(prop in config)){throw new Error("Missing property '"+prop+"' in layer configuration.");}} +var contents=capabilities.contents;var matrixSet=contents.tileMatrixSets[config.matrixSet];var layers=contents.layers;var layerDef;for(var i=0,ii=contents.layers.length;i<ii;++i){if(contents.layers[i].identifier===config.layer){layerDef=contents.layers[i];break;}} +if(layerDef&&matrixSet){var style;for(var i=0,ii=layerDef.styles.length;i<ii;++i){style=layerDef.styles[i];if(style.isDefault){break;}} +layer=new OpenLayers.Layer.WMTS(OpenLayers.Util.applyDefaults(config,{url:capabilities.operationsMetadata.GetTile.dcp.http.get,name:layerDef.title,style:style.identifier,matrixIds:matrixSet.matrixIds}));} +return layer;},CLASS_NAME:"OpenLayers.Format.WMTSCapabilities"});OpenLayers.Layer.SphericalMercator={getExtent:function(){var extent=null;if(this.sphericalMercator){extent=this.map.calculateBounds();}else{extent=OpenLayers.Layer.FixedZoomLevels.prototype.getExtent.apply(this);} +return extent;},getLonLatFromViewPortPx:function(viewPortPx){return OpenLayers.Layer.prototype.getLonLatFromViewPortPx.apply(this,arguments);},getViewPortPxFromLonLat:function(lonlat){return OpenLayers.Layer.prototype.getViewPortPxFromLonLat.apply(this,arguments);},initMercatorParameters:function(){this.RESOLUTIONS=[];var maxResolution=156543.03390625;for(var zoom=0;zoom<=this.MAX_ZOOM_LEVEL;++zoom){this.RESOLUTIONS[zoom]=maxResolution/Math.pow(2,zoom);} +this.units="m";this.projection=this.projection||"EPSG:900913";},forwardMercator:function(lon,lat){var x=lon*20037508.34/180;var y=Math.log(Math.tan((90+lat)*Math.PI/360))/(Math.PI/180);y=y*20037508.34/180;return new OpenLayers.LonLat(x,y);},inverseMercator:function(x,y){var lon=(x/20037508.34)*180;var lat=(y/20037508.34)*180;lat=180/Math.PI*(2*Math.atan(Math.exp(lat*Math.PI/180))-Math.PI/2);return new OpenLayers.LonLat(lon,lat);},projectForward:function(point){var lonlat=OpenLayers.Layer.SphericalMercator.forwardMercator(point.x,point.y);point.x=lonlat.lon;point.y=lonlat.lat;return point;},projectInverse:function(point){var lonlat=OpenLayers.Layer.SphericalMercator.inverseMercator(point.x,point.y);point.x=lonlat.lon;point.y=lonlat.lat;return point;}};(function(){var codes=["EPSG:900913","EPSG:3857","EPSG:102113","EPSG:102100"];var add=OpenLayers.Projection.addTransform;var merc=OpenLayers.Layer.SphericalMercator;var same=OpenLayers.Projection.nullTransform;var i,len,code,other,j;for(i=0,len=codes.length;i<len;++i){code=codes[i];add("EPSG:4326",code,merc.projectForward);add(code,"EPSG:4326",merc.projectInverse);for(j=i+1;j<len;++j){other=codes[j];add(code,other,same);add(other,code,same);}}})();OpenLayers.Format.WMTSCapabilities.v1_0_0=OpenLayers.Class(OpenLayers.Format.OWSCommon.v1_1_0,{version:"1.0.0",namespaces:{ows:"http://www.opengis.net/ows/1.1",wmts:"http://www.opengis.net/wmts/1.0",xlink:"http://www.w3.org/1999/xlink"},yx:null,defaultPrefix:"wmts",initialize:function(options){OpenLayers.Format.XML.prototype.initialize.apply(this,[options]);this.options=options;var yx=OpenLayers.Util.extend({},OpenLayers.Format.WMTSCapabilities.prototype.yx);this.yx=OpenLayers.Util.extend(yx,this.yx);},read:function(data){if(typeof data=="string"){data=OpenLayers.Format.XML.prototype.read.apply(this,[data]);} +if(data&&data.nodeType==9){data=data.documentElement;} +var capabilities={};this.readNode(data,capabilities);capabilities.version=this.version;return capabilities;},readers:{"wmts":{"Capabilities":function(node,obj){this.readChildNodes(node,obj);},"Contents":function(node,obj){obj.contents={};obj.contents.layers=[];obj.contents.tileMatrixSets={};this.readChildNodes(node,obj.contents);},"Layer":function(node,obj){var layer={styles:[],formats:[],tileMatrixSetLinks:[]};layer.layers=[];this.readChildNodes(node,layer);obj.layers.push(layer);},"Style":function(node,obj){var style={};style.isDefault=(node.getAttribute("isDefault")==="true");this.readChildNodes(node,style);obj.styles.push(style);},"Format":function(node,obj){obj.formats.push(this.getChildValue(node));},"TileMatrixSetLink":function(node,obj){var tileMatrixSetLink={};this.readChildNodes(node,tileMatrixSetLink);obj.tileMatrixSetLinks.push(tileMatrixSetLink);},"TileMatrixSet":function(node,obj){if(obj.layers){var tileMatrixSet={matrixIds:[]};this.readChildNodes(node,tileMatrixSet);obj.tileMatrixSets[tileMatrixSet.identifier]=tileMatrixSet;}else{obj.tileMatrixSet=this.getChildValue(node);}},"TileMatrix":function(node,obj){var tileMatrix={supportedCRS:obj.supportedCRS};this.readChildNodes(node,tileMatrix);obj.matrixIds.push(tileMatrix);},"ScaleDenominator":function(node,obj){obj.scaleDenominator=parseFloat(this.getChildValue(node));},"TopLeftCorner":function(node,obj){var topLeftCorner=this.getChildValue(node);var coords=topLeftCorner.split(" ");var yx;if(obj.supportedCRS){var crs=obj.supportedCRS.replace(/urn:ogc:def:crs:(\w+):.+:(\w+)$/,"urn:ogc:def:crs:$1::$2");yx=!!this.yx[crs];} +if(yx){obj.topLeftCorner=new OpenLayers.LonLat(coords[1],coords[0]);}else{obj.topLeftCorner=new OpenLayers.LonLat(coords[0],coords[1]);}},"TileWidth":function(node,obj){obj.tileWidth=parseInt(this.getChildValue(node));},"TileHeight":function(node,obj){obj.tileHeight=parseInt(this.getChildValue(node));},"MatrixWidth":function(node,obj){obj.matrixWidth=parseInt(this.getChildValue(node));},"MatrixHeight":function(node,obj){obj.matrixHeight=parseInt(this.getChildValue(node));},"ResourceURL":function(node,obj){obj.resourceUrl=obj.resourceUrl||{};obj.resourceUrl[node.getAttribute("resourceType")]={format:node.getAttribute("format"),template:node.getAttribute("template")};},"WSDL":function(node,obj){obj.wsdl={};obj.wsdl.href=node.getAttribute("xlink:href");},"ServiceMetadataURL":function(node,obj){obj.serviceMetadataUrl={};obj.serviceMetadataUrl.href=node.getAttribute("xlink:href");}},"ows":OpenLayers.Format.OWSCommon.v1_1_0.prototype.readers["ows"]},CLASS_NAME:"OpenLayers.Format.WMTSCapabilities.v1_0_0"});OpenLayers.Popup.FramedCloud=OpenLayers.Class(OpenLayers.Popup.Framed,{contentDisplayClass:"olFramedCloudPopupContent",autoSize:true,panMapIfOutOfView:true,imageSize:new OpenLayers.Size(1276,736),isAlphaImage:false,fixedRelativePosition:false,positionBlocks:{"tl":{'offset':new OpenLayers.Pixel(44,0),'padding':new OpenLayers.Bounds(8,40,8,9),'blocks':[{size:new OpenLayers.Size('auto','auto'),anchor:new OpenLayers.Bounds(0,51,22,0),position:new OpenLayers.Pixel(0,0)},{size:new OpenLayers.Size(22,'auto'),anchor:new OpenLayers.Bounds(null,50,0,0),position:new OpenLayers.Pixel(-1238,0)},{size:new OpenLayers.Size('auto',19),anchor:new OpenLayers.Bounds(0,32,22,null),position:new OpenLayers.Pixel(0,-631)},{size:new OpenLayers.Size(22,18),anchor:new OpenLayers.Bounds(null,32,0,null),position:new OpenLayers.Pixel(-1238,-632)},{size:new OpenLayers.Size(81,35),anchor:new OpenLayers.Bounds(null,0,0,null),position:new OpenLayers.Pixel(0,-688)}]},"tr":{'offset':new OpenLayers.Pixel(-45,0),'padding':new OpenLayers.Bounds(8,40,8,9),'blocks':[{size:new OpenLayers.Size('auto','auto'),anchor:new OpenLayers.Bounds(0,51,22,0),position:new OpenLayers.Pixel(0,0)},{size:new OpenLayers.Size(22,'auto'),anchor:new OpenLayers.Bounds(null,50,0,0),position:new OpenLayers.Pixel(-1238,0)},{size:new OpenLayers.Size('auto',19),anchor:new OpenLayers.Bounds(0,32,22,null),position:new OpenLayers.Pixel(0,-631)},{size:new OpenLayers.Size(22,19),anchor:new OpenLayers.Bounds(null,32,0,null),position:new OpenLayers.Pixel(-1238,-631)},{size:new OpenLayers.Size(81,35),anchor:new OpenLayers.Bounds(0,0,null,null),position:new OpenLayers.Pixel(-215,-687)}]},"bl":{'offset':new OpenLayers.Pixel(45,0),'padding':new OpenLayers.Bounds(8,9,8,40),'blocks':[{size:new OpenLayers.Size('auto','auto'),anchor:new OpenLayers.Bounds(0,21,22,32),position:new OpenLayers.Pixel(0,0)},{size:new OpenLayers.Size(22,'auto'),anchor:new OpenLayers.Bounds(null,21,0,32),position:new OpenLayers.Pixel(-1238,0)},{size:new OpenLayers.Size('auto',21),anchor:new OpenLayers.Bounds(0,0,22,null),position:new OpenLayers.Pixel(0,-629)},{size:new OpenLayers.Size(22,21),anchor:new OpenLayers.Bounds(null,0,0,null),position:new OpenLayers.Pixel(-1238,-629)},{size:new OpenLayers.Size(81,33),anchor:new OpenLayers.Bounds(null,null,0,0),position:new OpenLayers.Pixel(-101,-674)}]},"br":{'offset':new OpenLayers.Pixel(-44,0),'padding':new OpenLayers.Bounds(8,9,8,40),'blocks':[{size:new OpenLayers.Size('auto','auto'),anchor:new OpenLayers.Bounds(0,21,22,32),position:new OpenLayers.Pixel(0,0)},{size:new OpenLayers.Size(22,'auto'),anchor:new OpenLayers.Bounds(null,21,0,32),position:new OpenLayers.Pixel(-1238,0)},{size:new OpenLayers.Size('auto',21),anchor:new OpenLayers.Bounds(0,0,22,null),position:new OpenLayers.Pixel(0,-629)},{size:new OpenLayers.Size(22,21),anchor:new OpenLayers.Bounds(null,0,0,null),position:new OpenLayers.Pixel(-1238,-629)},{size:new OpenLayers.Size(81,33),anchor:new OpenLayers.Bounds(0,null,null,0),position:new OpenLayers.Pixel(-311,-674)}]}},minSize:new OpenLayers.Size(105,10),maxSize:new OpenLayers.Size(1200,660),initialize:function(id,lonlat,contentSize,contentHTML,anchor,closeBox,closeBoxCallback){this.imageSrc=OpenLayers.Util.getImagesLocation()+'cloud-popup-relative.png';OpenLayers.Popup.Framed.prototype.initialize.apply(this,arguments);this.contentDiv.className=this.contentDisplayClass;},destroy:function(){OpenLayers.Popup.Framed.prototype.destroy.apply(this,arguments);},CLASS_NAME:"OpenLayers.Popup.FramedCloud"});OpenLayers.Symbolizer.Point=OpenLayers.Class(OpenLayers.Symbolizer,{initialize:function(config){OpenLayers.Symbolizer.prototype.initialize.apply(this,arguments);},CLASS_NAME:"OpenLayers.Symbolizer.Point"});OpenLayers.Symbolizer.Line=OpenLayers.Class(OpenLayers.Symbolizer,{initialize:function(config){OpenLayers.Symbolizer.prototype.initialize.apply(this,arguments);},CLASS_NAME:"OpenLayers.Symbolizer.Line"});OpenLayers.Symbolizer.Polygon=OpenLayers.Class(OpenLayers.Symbolizer,{initialize:function(config){OpenLayers.Symbolizer.prototype.initialize.apply(this,arguments);},CLASS_NAME:"OpenLayers.Symbolizer.Polygon"});OpenLayers.Symbolizer.Text=OpenLayers.Class(OpenLayers.Symbolizer,{initialize:function(config){OpenLayers.Symbolizer.prototype.initialize.apply(this,arguments);},CLASS_NAME:"OpenLayers.Symbolizer.Text"});OpenLayers.Rule=OpenLayers.Class({id:null,name:null,title:null,description:null,context:null,filter:null,elseFilter:false,symbolizer:null,symbolizers:null,minScaleDenominator:null,maxScaleDenominator:null,initialize:function(options){this.symbolizer={};OpenLayers.Util.extend(this,options);if(this.symbolizers){delete this.symbolizer;} +this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_");},destroy:function(){for(var i in this.symbolizer){this.symbolizer[i]=null;} +this.symbolizer=null;delete this.symbolizers;},evaluate:function(feature){var context=this.getContext(feature);var applies=true;if(this.minScaleDenominator||this.maxScaleDenominator){var scale=feature.layer.map.getScale();} +if(this.minScaleDenominator){applies=scale>=OpenLayers.Style.createLiteral(this.minScaleDenominator,context);} +if(applies&&this.maxScaleDenominator){applies=scale<OpenLayers.Style.createLiteral(this.maxScaleDenominator,context);} +if(applies&&this.filter){if(this.filter.CLASS_NAME=="OpenLayers.Filter.FeatureId"){applies=this.filter.evaluate(feature);}else{applies=this.filter.evaluate(context);}} +return applies;},getContext:function(feature){var context=this.context;if(!context){context=feature.attributes||feature.data;} +if(typeof this.context=="function"){context=this.context(feature);} +return context;},clone:function(){var options=OpenLayers.Util.extend({},this);if(this.symbolizers){var len=this.symbolizers.length;options.symbolizers=new Array(len);for(var i=0;i<len;++i){options.symbolizers[i]=this.symbolizers[i].clone();}}else{options.symbolizer={};var value,type;for(var key in this.symbolizer){value=this.symbolizer[key];type=typeof value;if(type==="object"){options.symbolizer[key]=OpenLayers.Util.extend({},value);}else if(type==="string"){options.symbolizer[key]=value;}}} +options.filter=this.filter&&this.filter.clone();options.context=this.context&&OpenLayers.Util.extend({},this.context);return new OpenLayers.Rule(options);},CLASS_NAME:"OpenLayers.Rule"});OpenLayers.Handler.Pinch=OpenLayers.Class(OpenLayers.Handler,{started:false,stopDown:false,pinching:false,last:null,start:null,initialize:function(control,callbacks,options){OpenLayers.Handler.prototype.initialize.apply(this,arguments);},touchstart:function(evt){var propagate=true;this.pinching=false;if(OpenLayers.Event.isMultiTouch(evt)){this.started=true;this.last=this.start={distance:this.getDistance(evt.touches),delta:0,scale:1};this.callback("start",[evt,this.start]);propagate=!this.stopDown;}else{this.started=false;this.start=null;this.last=null;} +OpenLayers.Event.stop(evt);return propagate;},touchmove:function(evt){if(this.started&&OpenLayers.Event.isMultiTouch(evt)){this.pinching=true;var current=this.getPinchData(evt);this.callback("move",[evt,current]);this.last=current;OpenLayers.Event.stop(evt);} +return true;},touchend:function(evt){if(this.started){this.started=false;this.pinching=false;this.callback("done",[evt,this.start,this.last]);this.start=null;this.last=null;} +return true;},activate:function(){var activated=false;if(OpenLayers.Handler.prototype.activate.apply(this,arguments)){this.pinching=false;activated=true;} +return activated;},deactivate:function(){var deactivated=false;if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){this.started=false;this.pinching=false;this.start=null;this.last=null;deactivated=true;} +return deactivated;},getDistance:function(touches){var t0=touches[0];var t1=touches[1];return Math.sqrt(Math.pow(t0.clientX-t1.clientX,2)+ +Math.pow(t0.clientY-t1.clientY,2));},getPinchData:function(evt){var distance=this.getDistance(evt.touches);var scale=distance/this.start.distance;return{distance:distance,delta:this.last.distance-distance,scale:scale};},CLASS_NAME:"OpenLayers.Handler.Pinch"});OpenLayers.Filter.Comparison=OpenLayers.Class(OpenLayers.Filter,{type:null,property:null,value:null,matchCase:true,lowerBoundary:null,upperBoundary:null,initialize:function(options){OpenLayers.Filter.prototype.initialize.apply(this,[options]);if(this.type===OpenLayers.Filter.Comparison.LIKE&&options.matchCase===undefined){this.matchCase=null;}},evaluate:function(context){if(context instanceof OpenLayers.Feature.Vector){context=context.attributes;} +var result=false;var got=context[this.property];var exp;switch(this.type){case OpenLayers.Filter.Comparison.EQUAL_TO:exp=this.value;if(!this.matchCase&&typeof got=="string"&&typeof exp=="string"){result=(got.toUpperCase()==exp.toUpperCase());}else{result=(got==exp);} +break;case OpenLayers.Filter.Comparison.NOT_EQUAL_TO:exp=this.value;if(!this.matchCase&&typeof got=="string"&&typeof exp=="string"){result=(got.toUpperCase()!=exp.toUpperCase());}else{result=(got!=exp);} +break;case OpenLayers.Filter.Comparison.LESS_THAN:result=got<this.value;break;case OpenLayers.Filter.Comparison.GREATER_THAN:result=got>this.value;break;case OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO:result=got<=this.value;break;case OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO:result=got>=this.value;break;case OpenLayers.Filter.Comparison.BETWEEN:result=(got>=this.lowerBoundary)&&(got<=this.upperBoundary);break;case OpenLayers.Filter.Comparison.LIKE:var regexp=new RegExp(this.value,"gi");result=regexp.test(got);break;} +return result;},value2regex:function(wildCard,singleChar,escapeChar){if(wildCard=="."){var msg="'.' is an unsupported wildCard character for "+"OpenLayers.Filter.Comparison";OpenLayers.Console.error(msg);return null;} +wildCard=wildCard?wildCard:"*";singleChar=singleChar?singleChar:".";escapeChar=escapeChar?escapeChar:"!";this.value=this.value.replace(new RegExp("\\"+escapeChar+"(.|$)","g"),"\\$1");this.value=this.value.replace(new RegExp("\\"+singleChar,"g"),".");this.value=this.value.replace(new RegExp("\\"+wildCard,"g"),".*");this.value=this.value.replace(new RegExp("\\\\.\\*","g"),"\\"+wildCard);this.value=this.value.replace(new RegExp("\\\\\\.","g"),"\\"+singleChar);return this.value;},regex2value:function(){var value=this.value;value=value.replace(/!/g,"!!");value=value.replace(/(\\)?\\\./g,function($0,$1){return $1?$0:"!.";});value=value.replace(/(\\)?\\\*/g,function($0,$1){return $1?$0:"!*";});value=value.replace(/\\\\/g,"\\");value=value.replace(/\.\*/g,"*");return value;},clone:function(){return OpenLayers.Util.extend(new OpenLayers.Filter.Comparison(),this);},CLASS_NAME:"OpenLayers.Filter.Comparison"});OpenLayers.Filter.Comparison.EQUAL_TO="==";OpenLayers.Filter.Comparison.NOT_EQUAL_TO="!=";OpenLayers.Filter.Comparison.LESS_THAN="<";OpenLayers.Filter.Comparison.GREATER_THAN=">";OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO="<=";OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO=">=";OpenLayers.Filter.Comparison.BETWEEN="..";OpenLayers.Filter.Comparison.LIKE="~";OpenLayers.Format.QueryStringFilter=(function(){var cmpToStr={};cmpToStr[OpenLayers.Filter.Comparison.EQUAL_TO]="eq";cmpToStr[OpenLayers.Filter.Comparison.NOT_EQUAL_TO]="ne";cmpToStr[OpenLayers.Filter.Comparison.LESS_THAN]="lt";cmpToStr[OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO]="lte";cmpToStr[OpenLayers.Filter.Comparison.GREATER_THAN]="gt";cmpToStr[OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO]="gte";cmpToStr[OpenLayers.Filter.Comparison.LIKE]="ilike";function regex2value(value){value=value.replace(/%/g,"\\%");value=value.replace(/\\\\\.(\*)?/g,function($0,$1){return $1?$0:"\\\\_";});value=value.replace(/\\\\\.\*/g,"\\\\%");value=value.replace(/(\\)?\.(\*)?/g,function($0,$1,$2){return $1||$2?$0:"_";});value=value.replace(/(\\)?\.\*/g,function($0,$1){return $1?$0:"%";});value=value.replace(/\\\./g,".");value=value.replace(/(\\)?\\\*/g,function($0,$1){return $1?$0:"*";});return value;} +return OpenLayers.Class(OpenLayers.Format,{wildcarded:false,srsInBBOX:false,write:function(filter,params){params=params||{};var className=filter.CLASS_NAME;var filterType=className.substring(className.lastIndexOf(".")+1);switch(filterType){case"Spatial":switch(filter.type){case OpenLayers.Filter.Spatial.BBOX:params.bbox=filter.value.toArray();if(this.srsInBBOX&&filter.projection){params.bbox.push(filter.projection.getCode());} +break;case OpenLayers.Filter.Spatial.DWITHIN:params.tolerance=filter.distance;case OpenLayers.Filter.Spatial.WITHIN:params.lon=filter.value.x;params.lat=filter.value.y;break;default:OpenLayers.Console.warn("Unknown spatial filter type "+filter.type);} +break;case"Comparison":var op=cmpToStr[filter.type];if(op!==undefined){var value=filter.value;if(filter.type==OpenLayers.Filter.Comparison.LIKE){value=regex2value(value);if(this.wildcarded){value="%"+value+"%";}} +params[filter.property+"__"+op]=value;params.queryable=params.queryable||[];params.queryable.push(filter.property);}else{OpenLayers.Console.warn("Unknown comparison filter type "+filter.type);} +break;case"Logical":if(filter.type===OpenLayers.Filter.Logical.AND){for(var i=0,len=filter.filters.length;i<len;i++){params=this.write(filter.filters[i],params);}}else{OpenLayers.Console.warn("Unsupported logical filter type "+filter.type);} +break;default:OpenLayers.Console.warn("Unknown filter type "+filterType);} +return params;},CLASS_NAME:"OpenLayers.Format.QueryStringFilter"});})();OpenLayers.Layer.WMTS=OpenLayers.Class(OpenLayers.Layer.Grid,{isBaseLayer:true,version:"1.0.0",requestEncoding:"KVP",url:null,layer:null,matrixSet:null,style:null,format:"image/jpeg",tileOrigin:null,tileFullExtent:null,formatSuffix:null,matrixIds:null,dimensions:null,params:null,zoomOffset:0,formatSuffixMap:{"image/png":"png","image/png8":"png","image/png24":"png","image/png32":"png","png":"png","image/jpeg":"jpg","image/jpg":"jpg","jpeg":"jpg","jpg":"jpg"},matrix:null,initialize:function(config){var required={url:true,layer:true,style:true,matrixSet:true};for(var prop in required){if(!(prop in config)){throw new Error("Missing property '"+prop+"' in layer configuration.");}} +config.params=OpenLayers.Util.upperCaseObject(config.params);var args=[config.name,config.url,config.params,config];OpenLayers.Layer.Grid.prototype.initialize.apply(this,args);if(!this.formatSuffix){this.formatSuffix=this.formatSuffixMap[this.format]||this.format.split("/").pop();} +if(this.matrixIds){var len=this.matrixIds.length;if(len&&typeof this.matrixIds[0]==="string"){var ids=this.matrixIds;this.matrixIds=new Array(len);for(var i=0;i<len;++i){this.matrixIds[i]={identifier:ids[i]};}}}},setMap:function(){OpenLayers.Layer.Grid.prototype.setMap.apply(this,arguments);this.updateMatrixProperties();},updateMatrixProperties:function(){this.matrix=this.getMatrix();if(this.matrix){if(this.matrix.topLeftCorner){this.tileOrigin=this.matrix.topLeftCorner;} +if(this.matrix.tileWidth&&this.matrix.tileHeight){this.tileSize=new OpenLayers.Size(this.matrix.tileWidth,this.matrix.tileHeight);} +if(!this.tileOrigin){this.tileOrigin=new OpenLayers.LonLat(this.maxExtent.left,this.maxExtent.top);} +if(!this.tileFullExtent){this.tileFullExtent=this.maxExtent;}}},moveTo:function(bounds,zoomChanged,dragging){if(zoomChanged||!this.matrix){this.updateMatrixProperties();} +return OpenLayers.Layer.Grid.prototype.moveTo.apply(this,arguments);},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.WMTS(this.options);} +obj=OpenLayers.Layer.Grid.prototype.clone.apply(this,[obj]);return obj;},getMatrix:function(){var matrix;if(!this.matrixIds||this.matrixIds.length===0){matrix={identifier:this.map.getZoom()+this.zoomOffset};}else{if("scaleDenominator"in this.matrixIds[0]){var denom=OpenLayers.METERS_PER_INCH*OpenLayers.INCHES_PER_UNIT[this.units]*this.map.getResolution()/0.28E-3;var diff=Number.POSITIVE_INFINITY;var delta;for(var i=0,ii=this.matrixIds.length;i<ii;++i){delta=Math.abs(1-(this.matrixIds[i].scaleDenominator/denom));if(delta<diff){diff=delta;matrix=this.matrixIds[i];}}}else{matrix=this.matrixIds[this.map.getZoom()+this.zoomOffset];}} +return matrix;},getTileInfo:function(loc){var res=this.map.getResolution();var fx=(loc.lon-this.tileOrigin.lon)/(res*this.tileSize.w);var fy=(this.tileOrigin.lat-loc.lat)/(res*this.tileSize.h);var col=Math.floor(fx);var row=Math.floor(fy);return{col:col,row:row,i:Math.floor((fx-col)*this.tileSize.w),j:Math.floor((fy-row)*this.tileSize.h)};},getURL:function(bounds){bounds=this.adjustBounds(bounds);var url="";if(!this.tileFullExtent||this.tileFullExtent.intersectsBounds(bounds)){var center=bounds.getCenterLonLat();var info=this.getTileInfo(center);var matrixId=this.matrix.identifier;if(this.requestEncoding.toUpperCase()==="REST"){var path=this.version+"/"+this.layer+"/"+this.style+"/";if(this.dimensions){for(var i=0;i<this.dimensions.length;i++){if(this.params[this.dimensions[i]]){path=path+this.params[this.dimensions[i]]+"/";}}} +path=path+this.matrixSet+"/"+this.matrix.identifier+"/"+info.row+"/"+info.col+"."+this.formatSuffix;if(OpenLayers.Util.isArray(this.url)){url=this.selectUrl(path,this.url);}else{url=this.url;} +if(!url.match(/\/$/)){url=url+"/";} +url=url+path;}else if(this.requestEncoding.toUpperCase()==="KVP"){var params={SERVICE:"WMTS",REQUEST:"GetTile",VERSION:this.version,LAYER:this.layer,STYLE:this.style,TILEMATRIXSET:this.matrixSet,TILEMATRIX:this.matrix.identifier,TILEROW:info.row,TILECOL:info.col,FORMAT:this.format};url=OpenLayers.Layer.Grid.prototype.getFullRequestString.apply(this,[params]);}} +return url;},mergeNewParams:function(newParams){if(this.requestEncoding.toUpperCase()==="KVP"){return OpenLayers.Layer.Grid.prototype.mergeNewParams.apply(this,[OpenLayers.Util.upperCaseObject(newParams)]);}},CLASS_NAME:"OpenLayers.Layer.WMTS"});OpenLayers.Renderer.VML=OpenLayers.Class(OpenLayers.Renderer.Elements,{xmlns:"urn:schemas-microsoft-com:vml",symbolCache:{},offset:null,initialize:function(containerID){if(!this.supported()){return;} +if(!document.namespaces.olv){document.namespaces.add("olv",this.xmlns);var style=document.createStyleSheet();var shapes=['shape','rect','oval','fill','stroke','imagedata','group','textbox'];for(var i=0,len=shapes.length;i<len;i++){style.addRule('olv\\:'+shapes[i],"behavior: url(#default#VML); "+"position: absolute; display: inline-block;");}} +OpenLayers.Renderer.Elements.prototype.initialize.apply(this,arguments);},supported:function(){return!!(document.namespaces);},setExtent:function(extent,resolutionChanged){OpenLayers.Renderer.Elements.prototype.setExtent.apply(this,arguments);var resolution=this.getResolution();var left=(extent.left/resolution)|0;var top=(extent.top/resolution-this.size.h)|0;if(resolutionChanged||!this.offset){this.offset={x:left,y:top};left=0;top=0;}else{left=left-this.offset.x;top=top-this.offset.y;} +var org=left+" "+top;this.root.coordorigin=org;var roots=[this.root,this.vectorRoot,this.textRoot];var root;for(var i=0,len=roots.length;i<len;++i){root=roots[i];var size=this.size.w+" "+this.size.h;root.coordsize=size;} +this.root.style.flip="y";return true;},setSize:function(size){OpenLayers.Renderer.prototype.setSize.apply(this,arguments);var roots=[this.rendererRoot,this.root,this.vectorRoot,this.textRoot];var w=this.size.w+"px";var h=this.size.h+"px";var root;for(var i=0,len=roots.length;i<len;++i){root=roots[i];root.style.width=w;root.style.height=h;}},getNodeType:function(geometry,style){var nodeType=null;switch(geometry.CLASS_NAME){case"OpenLayers.Geometry.Point":if(style.externalGraphic){nodeType="olv:rect";}else if(this.isComplexSymbol(style.graphicName)){nodeType="olv:shape";}else{nodeType="olv:oval";} +break;case"OpenLayers.Geometry.Rectangle":nodeType="olv:rect";break;case"OpenLayers.Geometry.LineString":case"OpenLayers.Geometry.LinearRing":case"OpenLayers.Geometry.Polygon":case"OpenLayers.Geometry.Curve":case"OpenLayers.Geometry.Surface":nodeType="olv:shape";break;default:break;} +return nodeType;},setStyle:function(node,style,options,geometry){style=style||node._style;options=options||node._options;var fillColor=style.fillColor;if(node._geometryClass==="OpenLayers.Geometry.Point"){if(style.externalGraphic){options.isFilled=true;if(style.graphicTitle){node.title=style.graphicTitle;} +var width=style.graphicWidth||style.graphicHeight;var height=style.graphicHeight||style.graphicWidth;width=width?width:style.pointRadius*2;height=height?height:style.pointRadius*2;var resolution=this.getResolution();var xOffset=(style.graphicXOffset!=undefined)?style.graphicXOffset:-(0.5*width);var yOffset=(style.graphicYOffset!=undefined)?style.graphicYOffset:-(0.5*height);node.style.left=(((geometry.x/resolution-this.offset.x)+xOffset)|0)+"px";node.style.top=(((geometry.y/resolution-this.offset.y)-(yOffset+height))|0)+"px";node.style.width=width+"px";node.style.height=height+"px";node.style.flip="y";fillColor="none";options.isStroked=false;}else if(this.isComplexSymbol(style.graphicName)){var cache=this.importSymbol(style.graphicName);node.path=cache.path;node.coordorigin=cache.left+","+cache.bottom;var size=cache.size;node.coordsize=size+","+size;this.drawCircle(node,geometry,style.pointRadius);node.style.flip="y";}else{this.drawCircle(node,geometry,style.pointRadius);}} +if(options.isFilled){node.fillcolor=fillColor;}else{node.filled="false";} +var fills=node.getElementsByTagName("fill");var fill=(fills.length==0)?null:fills[0];if(!options.isFilled){if(fill){node.removeChild(fill);}}else{if(!fill){fill=this.createNode('olv:fill',node.id+"_fill");} +fill.opacity=style.fillOpacity;if(node._geometryClass==="OpenLayers.Geometry.Point"&&style.externalGraphic){if(style.graphicOpacity){fill.opacity=style.graphicOpacity;} +fill.src=style.externalGraphic;fill.type="frame";if(!(style.graphicWidth&&style.graphicHeight)){fill.aspect="atmost";}} +if(fill.parentNode!=node){node.appendChild(fill);}} +var rotation=style.rotation;if((rotation!==undefined||node._rotation!==undefined)){node._rotation=rotation;if(style.externalGraphic){this.graphicRotate(node,xOffset,yOffset,style);fill.opacity=0;}else if(node._geometryClass==="OpenLayers.Geometry.Point"){node.style.rotation=rotation||0;}} +var strokes=node.getElementsByTagName("stroke");var stroke=(strokes.length==0)?null:strokes[0];if(!options.isStroked){node.stroked=false;if(stroke){stroke.on=false;}}else{if(!stroke){stroke=this.createNode('olv:stroke',node.id+"_stroke");node.appendChild(stroke);} +stroke.on=true;stroke.color=style.strokeColor;stroke.weight=style.strokeWidth+"px";stroke.opacity=style.strokeOpacity;stroke.endcap=style.strokeLinecap=='butt'?'flat':(style.strokeLinecap||'round');if(style.strokeDashstyle){stroke.dashstyle=this.dashStyle(style);}} +if(style.cursor!="inherit"&&style.cursor!=null){node.style.cursor=style.cursor;} +return node;},graphicRotate:function(node,xOffset,yOffset,style){var style=style||node._style;var rotation=style.rotation||0;var aspectRatio,size;if(!(style.graphicWidth&&style.graphicHeight)){var img=new Image();img.onreadystatechange=OpenLayers.Function.bind(function(){if(img.readyState=="complete"||img.readyState=="interactive"){aspectRatio=img.width/img.height;size=Math.max(style.pointRadius*2,style.graphicWidth||0,style.graphicHeight||0);xOffset=xOffset*aspectRatio;style.graphicWidth=size*aspectRatio;style.graphicHeight=size;this.graphicRotate(node,xOffset,yOffset,style);}},this);img.src=style.externalGraphic;return;}else{size=Math.max(style.graphicWidth,style.graphicHeight);aspectRatio=style.graphicWidth/style.graphicHeight;} +var width=Math.round(style.graphicWidth||size*aspectRatio);var height=Math.round(style.graphicHeight||size);node.style.width=width+"px";node.style.height=height+"px";var image=document.getElementById(node.id+"_image");if(!image){image=this.createNode("olv:imagedata",node.id+"_image");node.appendChild(image);} +image.style.width=width+"px";image.style.height=height+"px";image.src=style.externalGraphic;image.style.filter="progid:DXImageTransform.Microsoft.AlphaImageLoader("+"src='', sizingMethod='scale')";var rot=rotation*Math.PI/180;var sintheta=Math.sin(rot);var costheta=Math.cos(rot);var filter="progid:DXImageTransform.Microsoft.Matrix(M11="+costheta+",M12="+(-sintheta)+",M21="+sintheta+",M22="+costheta+",SizingMethod='auto expand')\n";var opacity=style.graphicOpacity||style.fillOpacity;if(opacity&&opacity!=1){filter+="progid:DXImageTransform.Microsoft.BasicImage(opacity="+ +opacity+")\n";} +node.style.filter=filter;var centerPoint=new OpenLayers.Geometry.Point(-xOffset,-yOffset);var imgBox=new OpenLayers.Bounds(0,0,width,height).toGeometry();imgBox.rotate(style.rotation,centerPoint);var imgBounds=imgBox.getBounds();node.style.left=Math.round(parseInt(node.style.left)+imgBounds.left)+"px";node.style.top=Math.round(parseInt(node.style.top)-imgBounds.bottom)+"px";},postDraw:function(node){node.style.visibility="visible";var fillColor=node._style.fillColor;var strokeColor=node._style.strokeColor;if(fillColor=="none"&&node.fillcolor!=fillColor){node.fillcolor=fillColor;} +if(strokeColor=="none"&&node.strokecolor!=strokeColor){node.strokecolor=strokeColor;}},setNodeDimension:function(node,geometry){var bbox=geometry.getBounds();if(bbox){var resolution=this.getResolution();var scaledBox=new OpenLayers.Bounds((bbox.left/resolution-this.offset.x)|0,(bbox.bottom/resolution-this.offset.y)|0,(bbox.right/resolution-this.offset.x)|0,(bbox.top/resolution-this.offset.y)|0);node.style.left=scaledBox.left+"px";node.style.top=scaledBox.top+"px";node.style.width=scaledBox.getWidth()+"px";node.style.height=scaledBox.getHeight()+"px";node.coordorigin=scaledBox.left+" "+scaledBox.top;node.coordsize=scaledBox.getWidth()+" "+scaledBox.getHeight();}},dashStyle:function(style){var dash=style.strokeDashstyle;switch(dash){case'solid':case'dot':case'dash':case'dashdot':case'longdash':case'longdashdot':return dash;default:var parts=dash.split(/[ ,]/);if(parts.length==2){if(1*parts[0]>=2*parts[1]){return"longdash";} +return(parts[0]==1||parts[1]==1)?"dot":"dash";}else if(parts.length==4){return(1*parts[0]>=2*parts[1])?"longdashdot":"dashdot";} +return"solid";}},createNode:function(type,id){var node=document.createElement(type);if(id){node.id=id;} +node.unselectable='on';node.onselectstart=OpenLayers.Function.False;return node;},nodeTypeCompare:function(node,type){var subType=type;var splitIndex=subType.indexOf(":");if(splitIndex!=-1){subType=subType.substr(splitIndex+1);} +var nodeName=node.nodeName;splitIndex=nodeName.indexOf(":");if(splitIndex!=-1){nodeName=nodeName.substr(splitIndex+1);} +return(subType==nodeName);},createRenderRoot:function(){return this.nodeFactory(this.container.id+"_vmlRoot","div");},createRoot:function(suffix){return this.nodeFactory(this.container.id+suffix,"olv:group");},drawPoint:function(node,geometry){return this.drawCircle(node,geometry,1);},drawCircle:function(node,geometry,radius){if(!isNaN(geometry.x)&&!isNaN(geometry.y)){var resolution=this.getResolution();node.style.left=(((geometry.x/resolution-this.offset.x)|0)-radius)+"px";node.style.top=(((geometry.y/resolution-this.offset.y)|0)-radius)+"px";var diameter=radius*2;node.style.width=diameter+"px";node.style.height=diameter+"px";return node;} +return false;},drawLineString:function(node,geometry){return this.drawLine(node,geometry,false);},drawLinearRing:function(node,geometry){return this.drawLine(node,geometry,true);},drawLine:function(node,geometry,closeLine){this.setNodeDimension(node,geometry);var resolution=this.getResolution();var numComponents=geometry.components.length;var parts=new Array(numComponents);var comp,x,y;for(var i=0;i<numComponents;i++){comp=geometry.components[i];x=(comp.x/resolution-this.offset.x)|0;y=(comp.y/resolution-this.offset.y)|0;parts[i]=" "+x+","+y+" l ";} +var end=(closeLine)?" x e":" e";node.path="m"+parts.join("")+end;return node;},drawPolygon:function(node,geometry){this.setNodeDimension(node,geometry);var resolution=this.getResolution();var path=[];var j,jj,points,area,first,second,i,ii,comp,pathComp,x,y;for(j=0,jj=geometry.components.length;j<jj;j++){path.push("m");points=geometry.components[j].components;area=(j===0);first=null;second=null;for(i=0,ii=points.length;i<ii;i++){comp=points[i];x=(comp.x/resolution-this.offset.x)|0;y=(comp.y/resolution-this.offset.y)|0;pathComp=" "+x+","+y;path.push(pathComp);if(i==0){path.push(" l");} +if(!area){if(!first){first=pathComp;}else if(first!=pathComp){if(!second){second=pathComp;}else if(second!=pathComp){area=true;}}}} +path.push(area?" x ":" ");} +path.push("e");node.path=path.join("");return node;},drawRectangle:function(node,geometry){var resolution=this.getResolution();node.style.left=((geometry.x/resolution-this.offset.x)|0)+"px";node.style.top=((geometry.y/resolution-this.offset.y)|0)+"px";node.style.width=((geometry.width/resolution)|0)+"px";node.style.height=((geometry.height/resolution)|0)+"px";return node;},drawText:function(featureId,style,location){var label=this.nodeFactory(featureId+this.LABEL_ID_SUFFIX,"olv:rect");var textbox=this.nodeFactory(featureId+this.LABEL_ID_SUFFIX+"_textbox","olv:textbox");var resolution=this.getResolution();label.style.left=((location.x/resolution-this.offset.x)|0)+"px";label.style.top=((location.y/resolution-this.offset.y)|0)+"px";label.style.flip="y";textbox.innerText=style.label;if(style.cursor!="inherit"&&style.cursor!=null){textbox.style.cursor=style.cursor;} +if(style.fontColor){textbox.style.color=style.fontColor;} +if(style.fontOpacity){textbox.style.filter='alpha(opacity='+(style.fontOpacity*100)+')';} +if(style.fontFamily){textbox.style.fontFamily=style.fontFamily;} +if(style.fontSize){textbox.style.fontSize=style.fontSize;} +if(style.fontWeight){textbox.style.fontWeight=style.fontWeight;} +if(style.fontStyle){textbox.style.fontStyle=style.fontStyle;} +if(style.labelSelect===true){label._featureId=featureId;textbox._featureId=featureId;textbox._geometry=location;textbox._geometryClass=location.CLASS_NAME;} +textbox.style.whiteSpace="nowrap";textbox.inset="1px,0px,0px,0px";if(!label.parentNode){label.appendChild(textbox);this.textRoot.appendChild(label);} +var align=style.labelAlign||"cm";if(align.length==1){align+="m";} +var xshift=textbox.clientWidth*(OpenLayers.Renderer.VML.LABEL_SHIFT[align.substr(0,1)]);var yshift=textbox.clientHeight*(OpenLayers.Renderer.VML.LABEL_SHIFT[align.substr(1,1)]);label.style.left=parseInt(label.style.left)-xshift-1+"px";label.style.top=parseInt(label.style.top)+yshift+"px";},drawSurface:function(node,geometry){this.setNodeDimension(node,geometry);var resolution=this.getResolution();var path=[];var comp,x,y;for(var i=0,len=geometry.components.length;i<len;i++){comp=geometry.components[i];x=(comp.x/resolution-this.offset.x)|0;y=(comp.y/resolution-this.offset.y)|0;if((i%3)==0&&(i/3)==0){path.push("m");}else if((i%3)==1){path.push(" c");} +path.push(" "+x+","+y);} +path.push(" x e");node.path=path.join("");return node;},moveRoot:function(renderer){var layer=this.map.getLayer(renderer.container.id);if(layer instanceof OpenLayers.Layer.Vector.RootContainer){layer=this.map.getLayer(this.container.id);} +layer&&layer.renderer.clear();OpenLayers.Renderer.Elements.prototype.moveRoot.apply(this,arguments);layer&&layer.redraw();},importSymbol:function(graphicName){var id=this.container.id+"-"+graphicName;var cache=this.symbolCache[id];if(cache){return cache;} +var symbol=OpenLayers.Renderer.symbol[graphicName];if(!symbol){throw new Error(graphicName+' is not a valid symbol name');} +var symbolExtent=new OpenLayers.Bounds(Number.MAX_VALUE,Number.MAX_VALUE,0,0);var pathitems=["m"];for(var i=0;i<symbol.length;i=i+2){var x=symbol[i];var y=symbol[i+1];symbolExtent.left=Math.min(symbolExtent.left,x);symbolExtent.bottom=Math.min(symbolExtent.bottom,y);symbolExtent.right=Math.max(symbolExtent.right,x);symbolExtent.top=Math.max(symbolExtent.top,y);pathitems.push(x);pathitems.push(y);if(i==0){pathitems.push("l");}} +pathitems.push("x e");var path=pathitems.join(" ");var diff=(symbolExtent.getWidth()-symbolExtent.getHeight())/2;if(diff>0){symbolExtent.bottom=symbolExtent.bottom-diff;symbolExtent.top=symbolExtent.top+diff;}else{symbolExtent.left=symbolExtent.left+diff;symbolExtent.right=symbolExtent.right-diff;} +cache={path:path,size:symbolExtent.getWidth(),left:symbolExtent.left,bottom:symbolExtent.bottom};this.symbolCache[id]=cache;return cache;},CLASS_NAME:"OpenLayers.Renderer.VML"});OpenLayers.Renderer.VML.LABEL_SHIFT={"l":0,"c":.5,"r":1,"t":0,"m":.5,"b":1};OpenLayers.Protocol=OpenLayers.Class({format:null,options:null,autoDestroy:true,defaultFilter:null,initialize:function(options){options=options||{};OpenLayers.Util.extend(this,options);this.options=options;},mergeWithDefaultFilter:function(filter){var merged;if(filter&&this.defaultFilter){merged=new OpenLayers.Filter.Logical({type:OpenLayers.Filter.Logical.AND,filters:[this.defaultFilter,filter]});}else{merged=filter||this.defaultFilter||undefined;} +return merged;},destroy:function(){this.options=null;this.format=null;},read:function(options){options=options||{};options.filter=this.mergeWithDefaultFilter(options.filter);},create:function(){},update:function(){},"delete":function(){},commit:function(){},abort:function(response){},createCallback:function(method,response,options){return OpenLayers.Function.bind(function(){method.apply(this,[response,options]);},this);},CLASS_NAME:"OpenLayers.Protocol"});OpenLayers.Protocol.Response=OpenLayers.Class({code:null,requestType:null,last:true,features:null,reqFeatures:null,priv:null,error:null,initialize:function(options){OpenLayers.Util.extend(this,options);},success:function(){return this.code>0;},CLASS_NAME:"OpenLayers.Protocol.Response"});OpenLayers.Protocol.Response.SUCCESS=1;OpenLayers.Protocol.Response.FAILURE=0;OpenLayers.Protocol.HTTP=OpenLayers.Class(OpenLayers.Protocol,{url:null,headers:null,params:null,callback:null,scope:null,readWithPOST:false,wildcarded:false,srsInBBOX:false,initialize:function(options){options=options||{};this.params={};this.headers={};OpenLayers.Protocol.prototype.initialize.apply(this,arguments);if(!this.filterToParams&&OpenLayers.Format.QueryStringFilter){var format=new OpenLayers.Format.QueryStringFilter({wildcarded:this.wildcarded,srsInBBOX:this.srsInBBOX});this.filterToParams=function(filter,params){return format.write(filter,params);}}},destroy:function(){this.params=null;this.headers=null;OpenLayers.Protocol.prototype.destroy.apply(this);},read:function(options){OpenLayers.Protocol.prototype.read.apply(this,arguments);options=options||{};options.params=OpenLayers.Util.applyDefaults(options.params,this.options.params);options=OpenLayers.Util.applyDefaults(options,this.options);if(options.filter&&this.filterToParams){options.params=this.filterToParams(options.filter,options.params);} +var readWithPOST=(options.readWithPOST!==undefined)?options.readWithPOST:this.readWithPOST;var resp=new OpenLayers.Protocol.Response({requestType:"read"});if(readWithPOST){resp.priv=OpenLayers.Request.POST({url:options.url,callback:this.createCallback(this.handleRead,resp,options),data:OpenLayers.Util.getParameterString(options.params),headers:{"Content-Type":"application/x-www-form-urlencoded"}});}else{resp.priv=OpenLayers.Request.GET({url:options.url,callback:this.createCallback(this.handleRead,resp,options),params:options.params,headers:options.headers});} +return resp;},handleRead:function(resp,options){this.handleResponse(resp,options);},create:function(features,options){options=OpenLayers.Util.applyDefaults(options,this.options);var resp=new OpenLayers.Protocol.Response({reqFeatures:features,requestType:"create"});resp.priv=OpenLayers.Request.POST({url:options.url,callback:this.createCallback(this.handleCreate,resp,options),headers:options.headers,data:this.format.write(features)});return resp;},handleCreate:function(resp,options){this.handleResponse(resp,options);},update:function(feature,options){options=options||{};var url=options.url||feature.url||this.options.url+"/"+feature.fid;options=OpenLayers.Util.applyDefaults(options,this.options);var resp=new OpenLayers.Protocol.Response({reqFeatures:feature,requestType:"update"});resp.priv=OpenLayers.Request.PUT({url:url,callback:this.createCallback(this.handleUpdate,resp,options),headers:options.headers,data:this.format.write(feature)});return resp;},handleUpdate:function(resp,options){this.handleResponse(resp,options);},"delete":function(feature,options){options=options||{};var url=options.url||feature.url||this.options.url+"/"+feature.fid;options=OpenLayers.Util.applyDefaults(options,this.options);var resp=new OpenLayers.Protocol.Response({reqFeatures:feature,requestType:"delete"});resp.priv=OpenLayers.Request.DELETE({url:url,callback:this.createCallback(this.handleDelete,resp,options),headers:options.headers});return resp;},handleDelete:function(resp,options){this.handleResponse(resp,options);},handleResponse:function(resp,options){var request=resp.priv;if(options.callback){if(request.status>=200&&request.status<300){if(resp.requestType!="delete"){resp.features=this.parseFeatures(request);} +resp.code=OpenLayers.Protocol.Response.SUCCESS;}else{resp.code=OpenLayers.Protocol.Response.FAILURE;} +options.callback.call(options.scope,resp);}},parseFeatures:function(request){var doc=request.responseXML;if(!doc||!doc.documentElement){doc=request.responseText;} +if(!doc||doc.length<=0){return null;} +return this.format.read(doc);},commit:function(features,options){options=OpenLayers.Util.applyDefaults(options,this.options);var resp=[],nResponses=0;var types={};types[OpenLayers.State.INSERT]=[];types[OpenLayers.State.UPDATE]=[];types[OpenLayers.State.DELETE]=[];var feature,list,requestFeatures=[];for(var i=0,len=features.length;i<len;++i){feature=features[i];list=types[feature.state];if(list){list.push(feature);requestFeatures.push(feature);}} +var nRequests=(types[OpenLayers.State.INSERT].length>0?1:0)+ +types[OpenLayers.State.UPDATE].length+ +types[OpenLayers.State.DELETE].length;var success=true;var finalResponse=new OpenLayers.Protocol.Response({reqFeatures:requestFeatures});function insertCallback(response){var len=response.features?response.features.length:0;var fids=new Array(len);for(var i=0;i<len;++i){fids[i]=response.features[i].fid;} +finalResponse.insertIds=fids;callback.apply(this,[response]);} +function callback(response){this.callUserCallback(response,options);success=success&&response.success();nResponses++;if(nResponses>=nRequests){if(options.callback){finalResponse.code=success?OpenLayers.Protocol.Response.SUCCESS:OpenLayers.Protocol.Response.FAILURE;options.callback.apply(options.scope,[finalResponse]);}}} +var queue=types[OpenLayers.State.INSERT];if(queue.length>0){resp.push(this.create(queue,OpenLayers.Util.applyDefaults({callback:insertCallback,scope:this},options.create)));} +queue=types[OpenLayers.State.UPDATE];for(var i=queue.length-1;i>=0;--i){resp.push(this.update(queue[i],OpenLayers.Util.applyDefaults({callback:callback,scope:this},options.update)));} +queue=types[OpenLayers.State.DELETE];for(var i=queue.length-1;i>=0;--i){resp.push(this["delete"](queue[i],OpenLayers.Util.applyDefaults({callback:callback,scope:this},options["delete"])));} +return resp;},abort:function(response){if(response){response.priv.abort();}},callUserCallback:function(resp,options){var opt=options[resp.requestType];if(opt&&opt.callback){opt.callback.call(opt.scope,resp);}},CLASS_NAME:"OpenLayers.Protocol.HTTP"});OpenLayers.Format.JSON=OpenLayers.Class(OpenLayers.Format,{indent:" ",space:" ",newline:"\n",level:0,pretty:false,nativeJSON:(function(){return!!(window.JSON&&typeof JSON.parse=="function"&&typeof JSON.stringify=="function");})(),read:function(json,filter){var object;if(this.nativeJSON){object=JSON.parse(json,filter);}else try{if(/^[\],:{}\s]*$/.test(json.replace(/\\["\\\/bfnrtu]/g,'@').replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,']').replace(/(?:^|:|,)(?:\s*\[)+/g,''))){object=eval('('+json+')');if(typeof filter==='function'){function walk(k,v){if(v&&typeof v==='object'){for(var i in v){if(v.hasOwnProperty(i)){v[i]=walk(i,v[i]);}}} +return filter(k,v);} +object=walk('',object);}}}catch(e){} +if(this.keepData){this.data=object;} +return object;},write:function(value,pretty){this.pretty=!!pretty;var json=null;var type=typeof value;if(this.serialize[type]){try{json=(!this.pretty&&this.nativeJSON)?JSON.stringify(value):this.serialize[type].apply(this,[value]);}catch(err){OpenLayers.Console.error("Trouble serializing: "+err);}} +return json;},writeIndent:function(){var pieces=[];if(this.pretty){for(var i=0;i<this.level;++i){pieces.push(this.indent);}} +return pieces.join('');},writeNewline:function(){return(this.pretty)?this.newline:'';},writeSpace:function(){return(this.pretty)?this.space:'';},serialize:{'object':function(object){if(object==null){return"null";} +if(object.constructor==Date){return this.serialize.date.apply(this,[object]);} +if(object.constructor==Array){return this.serialize.array.apply(this,[object]);} +var pieces=['{'];this.level+=1;var key,keyJSON,valueJSON;var addComma=false;for(key in object){if(object.hasOwnProperty(key)){keyJSON=OpenLayers.Format.JSON.prototype.write.apply(this,[key,this.pretty]);valueJSON=OpenLayers.Format.JSON.prototype.write.apply(this,[object[key],this.pretty]);if(keyJSON!=null&&valueJSON!=null){if(addComma){pieces.push(',');} +pieces.push(this.writeNewline(),this.writeIndent(),keyJSON,':',this.writeSpace(),valueJSON);addComma=true;}}} +this.level-=1;pieces.push(this.writeNewline(),this.writeIndent(),'}');return pieces.join('');},'array':function(array){var json;var pieces=['['];this.level+=1;for(var i=0,len=array.length;i<len;++i){json=OpenLayers.Format.JSON.prototype.write.apply(this,[array[i],this.pretty]);if(json!=null){if(i>0){pieces.push(',');} +pieces.push(this.writeNewline(),this.writeIndent(),json);}} +this.level-=1;pieces.push(this.writeNewline(),this.writeIndent(),']');return pieces.join('');},'string':function(string){var m={'\b':'\\b','\t':'\\t','\n':'\\n','\f':'\\f','\r':'\\r','"':'\\"','\\':'\\\\'};if(/["\\\x00-\x1f]/.test(string)){return'"'+string.replace(/([\x00-\x1f\\"])/g,function(a,b){var c=m[b];if(c){return c;} +c=b.charCodeAt();return'\\u00'+ +Math.floor(c/16).toString(16)+ +(c%16).toString(16);})+'"';} +return'"'+string+'"';},'number':function(number){return isFinite(number)?String(number):"null";},'boolean':function(bool){return String(bool);},'date':function(date){function format(number){return(number<10)?'0'+number:number;} +return'"'+date.getFullYear()+'-'+ +format(date.getMonth()+1)+'-'+ +format(date.getDate())+'T'+ +format(date.getHours())+':'+ +format(date.getMinutes())+':'+ +format(date.getSeconds())+'"';}},CLASS_NAME:"OpenLayers.Format.JSON"});OpenLayers.Control.DragFeature=OpenLayers.Class(OpenLayers.Control,{geometryTypes:null,onStart:function(feature,pixel){},onDrag:function(feature,pixel){},onComplete:function(feature,pixel){},onEnter:function(feature){},onLeave:function(feature){},documentDrag:false,layer:null,feature:null,dragCallbacks:{},featureCallbacks:{},lastPixel:null,initialize:function(layer,options){OpenLayers.Control.prototype.initialize.apply(this,[options]);this.layer=layer;this.handlers={drag:new OpenLayers.Handler.Drag(this,OpenLayers.Util.extend({down:this.downFeature,move:this.moveFeature,up:this.upFeature,out:this.cancel,done:this.doneDragging},this.dragCallbacks),{documentDrag:this.documentDrag}),feature:new OpenLayers.Handler.Feature(this,this.layer,OpenLayers.Util.extend({click:this.clickFeature,clickout:this.clickoutFeature,over:this.overFeature,out:this.outFeature},this.featureCallbacks),{geometryTypes:this.geometryTypes})};},clickFeature:function(feature){if(this.handlers.feature.touch&&!this.over&&this.overFeature(feature)){this.handlers.drag.dragstart(this.handlers.feature.evt);this.handlers.drag.stopDown=false;}},clickoutFeature:function(feature){if(this.handlers.feature.touch&&this.over){this.outFeature(feature);this.handlers.drag.stopDown=true;}},destroy:function(){this.layer=null;OpenLayers.Control.prototype.destroy.apply(this,[]);},activate:function(){return(this.handlers.feature.activate()&&OpenLayers.Control.prototype.activate.apply(this,arguments));},deactivate:function(){this.handlers.drag.deactivate();this.handlers.feature.deactivate();this.feature=null;this.dragging=false;this.lastPixel=null;OpenLayers.Element.removeClass(this.map.viewPortDiv,this.displayClass+"Over");return OpenLayers.Control.prototype.deactivate.apply(this,arguments);},overFeature:function(feature){var activated=false;if(!this.handlers.drag.dragging){this.feature=feature;this.handlers.drag.activate();activated=true;this.over=true;OpenLayers.Element.addClass(this.map.viewPortDiv,this.displayClass+"Over");this.onEnter(feature);}else{if(this.feature.id==feature.id){this.over=true;}else{this.over=false;}} +return activated;},downFeature:function(pixel){this.lastPixel=pixel;this.onStart(this.feature,pixel);},moveFeature:function(pixel){var res=this.map.getResolution();this.feature.geometry.move(res*(pixel.x-this.lastPixel.x),res*(this.lastPixel.y-pixel.y));this.layer.drawFeature(this.feature);this.lastPixel=pixel;this.onDrag(this.feature,pixel);},upFeature:function(pixel){if(!this.over){this.handlers.drag.deactivate();}},doneDragging:function(pixel){this.onComplete(this.feature,pixel);},outFeature:function(feature){if(!this.handlers.drag.dragging){this.over=false;this.handlers.drag.deactivate();OpenLayers.Element.removeClass(this.map.viewPortDiv,this.displayClass+"Over");this.onLeave(feature);this.feature=null;}else{if(this.feature.id==feature.id){this.over=false;}}},cancel:function(){this.handlers.drag.deactivate();this.over=false;},setMap:function(map){this.handlers.drag.setMap(map);this.handlers.feature.setMap(map);OpenLayers.Control.prototype.setMap.apply(this,arguments);},CLASS_NAME:"OpenLayers.Control.DragFeature"});OpenLayers.Control.PinchZoom=OpenLayers.Class(OpenLayers.Control,{type:OpenLayers.Control.TYPE_TOOL,containerOrigin:null,pinchOrigin:null,currentCenter:null,autoActivate:true,initialize:function(options){OpenLayers.Control.prototype.initialize.apply(this,arguments);this.handler=new OpenLayers.Handler.Pinch(this,{start:this.pinchStart,move:this.pinchMove,done:this.pinchDone},this.handlerOptions);},activate:function(){var activated=OpenLayers.Control.prototype.activate.apply(this,arguments);if(activated){this.map.events.on({moveend:this.updateContainerOrigin,scope:this});this.updateContainerOrigin();} +return activated;},deactivate:function(){var deactivated=OpenLayers.Control.prototype.deactivate.apply(this,arguments);if(this.map&&this.map.events){this.map.events.un({moveend:this.updateContainerOrigin,scope:this});} +return deactivated;},updateContainerOrigin:function(){var container=this.map.layerContainerDiv;this.containerOrigin={x:parseInt(container.style.left,10),y:parseInt(container.style.top,10)};},pinchStart:function(evt,pinchData){this.pinchOrigin=evt.xy;this.currentCenter=evt.xy;},pinchMove:function(evt,pinchData){var scale=pinchData.scale;var containerOrigin=this.containerOrigin;var pinchOrigin=this.pinchOrigin;var current=evt.xy;var dx=Math.round((current.x-pinchOrigin.x)+(scale-1)*(containerOrigin.x-pinchOrigin.x));var dy=Math.round((current.y-pinchOrigin.y)+(scale-1)*(containerOrigin.y-pinchOrigin.y));this.applyTransform("translate("+dx+"px, "+dy+"px) scale("+scale+")");this.currentCenter=current;},applyTransform:function(transform){var style=this.map.layerContainerDiv.style;style['-webkit-transform']=transform;style['-moz-transform']=transform;},pinchDone:function(evt,start,last){this.applyTransform("");var zoom=this.map.getZoomForResolution(this.map.getResolution()/last.scale,true);if(zoom!==this.map.getZoom()||!this.currentCenter.equals(this.pinchOrigin)){var resolution=this.map.getResolutionForZoom(zoom);var location=this.map.getLonLatFromPixel(this.pinchOrigin);var zoomPixel=this.currentCenter;var size=this.map.getSize();location.lon+=resolution*((size.w/2)-zoomPixel.x);location.lat-=resolution*((size.h/2)-zoomPixel.y);this.map.setCenter(location,zoom);}},CLASS_NAME:"OpenLayers.Control.PinchZoom"});
\ No newline at end of file diff --git a/web/js/OpenLayers.Projection.CH1903.js b/web/js/OpenLayers.Projection.CH1903.js new file mode 100644 index 000000000..34a0500fa --- /dev/null +++ b/web/js/OpenLayers.Projection.CH1903.js @@ -0,0 +1,128 @@ +/** + * OpenLayers Swiss (CH1903) grid projection transformations + * + * Provides transform functions for WGS84<->CH1903 projections. + * + * Maths courtesy of the Swiss Federal Office of Topography: + * http://www.swisstopo.admin.ch/internet/swisstopo/en/home/products/software/products/skripts.html + * Simplifed a bit, and with x/y swapped the normal way round. + */ + +OpenLayers.Projection.CH1903 = { + + // Convert WGS lat/long (° dec) to CH x + WGStoCHx: function(lat, lng) { + + // Converts degrees dec to seconds + lat = lat * 3600; + lng = lng * 3600; + + // Auxiliary values (% Bern) + var lat_aux = (lat - 169028.66) / 10000; + var lng_aux = (lng - 26782.5) / 10000; + + // Process X + var x = 600072.37; + x = x + (211455.93 * lng_aux); + x = x - (10938.51 * lng_aux * lat_aux); + x = x - (0.36 * lng_aux * Math.pow(lat_aux, 2)); + x = x - (44.54 * Math.pow(lng_aux, 3)); + + return x; + }, + + // Convert WGS lat/long (° dec) to CH y + WGStoCHy: function(lat, lng) { + + // Converts degrees dec to seconds + lat = lat * 3600; + lng = lng * 3600; + + // Auxiliary values (% Bern) + var lat_aux = (lat - 169028.66)/10000; + var lng_aux = (lng - 26782.5)/10000; + + // Process Y + var y = 200147.07; + y = y + (308807.95 * lat_aux); + y = y + (3745.25 * Math.pow(lng_aux, 2)); + y = y + (76.63 * Math.pow(lat_aux, 2)); + y = y - (194.56 * Math.pow(lng_aux, 2) * lat_aux); + y = y + (119.79 * Math.pow(lat_aux, 3)); + + return y; + + }, + + // Convert CH x/y to WGS lat + chToWGSlat: function(x, y) { + + // Converts militar to civil and to unit = 1000km + // Axiliary values (% Bern) + var x_aux = (x - 600000) / 1000000; + var y_aux = (y - 200000) / 1000000; + + // Process lat + var lat = 16.9023892; + lat = lat + (3.238272 * y_aux); + lat = lat - (0.270978 * Math.pow(x_aux, 2)); + lat = lat - (0.002528 * Math.pow(y_aux, 2)); + lat = lat - (0.0447 * Math.pow(x_aux, 2) * y_aux); + lat = lat - (0.0140 * Math.pow(y_aux, 3)); + + // Unit 10000" to 1 " and converts seconds to degrees (dec) + lat = lat * 100 / 36; + + return lat; + + }, + + // Convert CH x/y to WGS long + chToWGSlng: function(x, y) { + + // Converts militar to civil and to unit = 1000km + // Axiliary values (% Bern) + var x_aux = (x - 600000) / 1000000; + var y_aux = (y - 200000) / 1000000; + + // Process long + var lng = 2.6779094; + lng = lng + (4.728982 * x_aux); + lng = lng + (0.791484 * x_aux * y_aux); + lng = lng + (0.1306 * x_aux * Math.pow(y_aux, 2)); + lng = lng - (0.0436 * Math.pow(x_aux, 3)); + + // Unit 10000" to 1 " and converts seconds to degrees (dec) + lng = lng * 100 / 36; + + return lng; + + }, + + // Function to convert a WGS84 coordinate to a Swiss coordinate. + projectForwardSwiss: function(point) { + var x = OpenLayers.Projection.CH1903.WGStoCHx(point.y, point.x), + y = OpenLayers.Projection.CH1903.WGStoCHy(point.y, point.x); + point.x = x; + point.y = y; + return point; + }, + + // Function to convert a Swiss coordinate to a WGS84 coordinate. + projectInverseSwiss: function(point) { + var lon = OpenLayers.Projection.CH1903.chToWGSlng(point.x, point.y); + var lat = OpenLayers.Projection.CH1903.chToWGSlat(point.x, point.y); + point.x = lon; + point.y = lat; + return point; + } +}; + +/** + * Note: One transform declared + * Transforms from EPSG:4326 to EPSG:21781 + */ + OpenLayers.Projection.addTransform("EPSG:4326", "EPSG:21781", + OpenLayers.Projection.CH1903.projectForwardSwiss); + OpenLayers.Projection.addTransform("EPSG:21781", "EPSG:4326", + OpenLayers.Projection.CH1903.projectInverseSwiss); diff --git a/web/js/fixmystreet.js b/web/js/fixmystreet.js index 6ae4ed92d..98e92606d 100644 --- a/web/js/fixmystreet.js +++ b/web/js/fixmystreet.js @@ -134,7 +134,7 @@ $(function(){ // Geolocation if (geo_position_js.init()) { - var link = '<a href="#LINK" id="geolocate_link">… or locate me automatically</a>'; + var link = '<a href="#LINK" id="geolocate_link">… ' + validation_strings.geolocate + '</a>'; $('form[action="/alert/list"]').append(link.replace('LINK','alert/list')); if ($('body.frontpage').length) { $('#postcodeForm').after(link.replace('LINK','around')); diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 0a5f339f5..85ab09889 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -137,7 +137,7 @@ function fixmystreet_onload() { styleMap: pin_layer_style_map }; if (fixmystreet.page == 'around') { - fixmystreet.bbox_strategy = new OpenLayers.Strategy.BBOX({ ratio: 1 }); + fixmystreet.bbox_strategy = fixmystreet.bbox_strategy || new OpenLayers.Strategy.BBOX({ ratio: 1 }); pin_layer_options.strategies = [ fixmystreet.bbox_strategy ]; pin_layer_options.protocol = new OpenLayers.Protocol.HTTP({ url: '/ajax', @@ -250,23 +250,35 @@ function fixmystreet_onload() { $(function(){ - set_map_config(); + // Set specific map config - some other JS included in the + // template should define this + set_map_config(); - fixmystreet.map = new OpenLayers.Map("map", { - controls: fixmystreet.controls, - displayProjection: new OpenLayers.Projection("EPSG:4326") - }); + // Create the basics of the map + fixmystreet.map = new OpenLayers.Map( + "map", OpenLayers.Util.extend({ + controls: fixmystreet.controls, + displayProjection: new OpenLayers.Projection("EPSG:4326") + }, fixmystreet.map_options) + ); if ($('html').hasClass('mobile') && fixmystreet.page == 'around') { $('#fms_pan_zoom').css({ top: '2.75em !important' }); } + // Set it up our way fixmystreet.layer_options = OpenLayers.Util.extend({ zoomOffset: fixmystreet.zoomOffset, transitionEffect: 'resize', numZoomLevels: fixmystreet.numZoomLevels }, fixmystreet.layer_options); - var layer = new fixmystreet.map_type("", fixmystreet.layer_options); + + var layer; + if (fixmystreet.layer_options.matrixIds) { + layer = new fixmystreet.map_type(fixmystreet.layer_options); + } else { + layer = new fixmystreet.map_type("", fixmystreet.layer_options); + } fixmystreet.map.addLayer(layer); if (!fixmystreet.map.getCenter()) { diff --git a/web/js/map-wmts-zurich.js b/web/js/map-wmts-zurich.js new file mode 100644 index 000000000..8ecca50a1 --- /dev/null +++ b/web/js/map-wmts-zurich.js @@ -0,0 +1,83 @@ +/* + * Maps for FMZ using Zurich council's WMTS tile server + */ + +/* + * set_map_config() is called on dom ready in map-OpenLayers.js + * to setup the way the map should operate. + */ + function set_map_config(perm) { + // This stuff is copied from js/map-bing-ol.js + var permalink_id; + if ($('#map_permalink').length) { + permalink_id = 'map_permalink'; + } + + var nav_opts = { zoomWheelEnabled: false }; + if (fixmystreet.page == 'around' && $('html').hasClass('mobile')) { + nav_opts = {}; + } + fixmystreet.nav_control = new OpenLayers.Control.Navigation(nav_opts); + + fixmystreet.controls = [ + new OpenLayers.Control.Attribution(), + new OpenLayers.Control.ArgParser(), + fixmystreet.nav_control, + new OpenLayers.Control.Permalink(permalink_id), + new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' }) + ]; + + fixmystreet.map_type = OpenLayers.Layer.WMTS; + + // Set DPI - default is 72 + OpenLayers.DOTS_PER_INCH = 96; + + fixmystreet.map_options = { + projection: new OpenLayers.Projection("EPSG:21781"), + maxExtent: new OpenLayers.Bounds(676000, 241000, 690000, 255000), + units: 'm', + scales: [ '250000', '125000', '64000', '32000', '16000', '8000', '4000', '2000', '1000', '500'] + }; + + fixmystreet.layer_options = { + name: "Luftbild", + layer: "Luftbild", + matrixSet: "nativeTileMatrixSet", + requestEncoding: "REST", + url: "http://www.wmts.stadt-zuerich.ch/Luftbild/MapServer/WMTS/tile/", + style: "default", + matrixIds: [ + { identifier: "0", matrixHeight: 2, matrixWidth: 2, scaleDenominator: 250000, supportedCRS: "urn:ogc:def:crs:EPSG::21781", tileHeight: 256, tileWidth: 256, topLeftCorner: { lat: 30814423, lon: -29386322 } }, + { identifier: "1", matrixHeight: 3, matrixWidth: 3, scaleDenominator: 125000, supportedCRS: "urn:ogc:def:crs:EPSG::21781", tileHeight: 256, tileWidth: 256, topLeftCorner: { lat: 30814423, lon: -29386322 } }, + { identifier: "2", matrixHeight: 4, matrixWidth: 5, scaleDenominator: 64000, supportedCRS: "urn:ogc:def:crs:EPSG::21781", tileHeight: 256, tileWidth: 256, topLeftCorner: { lat: 30814423, lon: -29386322 } }, + { identifier: "3", matrixHeight: 7, matrixWidth: 8, scaleDenominator: 32000, supportedCRS: "urn:ogc:def:crs:EPSG::21781", tileHeight: 256, tileWidth: 256, topLeftCorner: { lat: 30814423, lon: -29386322 } }, + { identifier: "4", matrixHeight: 14, matrixWidth: 14, scaleDenominator: 16000, supportedCRS: "urn:ogc:def:crs:EPSG::21781", tileHeight: 256, tileWidth: 256, topLeftCorner: { lat: 30814423, lon: -29386322 } }, + { identifier: "5", matrixHeight: 27, matrixWidth: 27, scaleDenominator: 8000, supportedCRS: "urn:ogc:def:crs:EPSG::21781", tileHeight: 256, tileWidth: 256, topLeftCorner: { lat: 30814423, lon: -29386322 } }, + { identifier: "6", matrixHeight: 52, matrixWidth: 53, scaleDenominator: 4000, supportedCRS: "urn:ogc:def:crs:EPSG::21781", tileHeight: 256, tileWidth: 256, topLeftCorner: { lat: 30814423, lon: -29386322 } }, + { identifier: "7", matrixHeight: 104, matrixWidth: 105, scaleDenominator: 2000, supportedCRS: "urn:ogc:def:crs:EPSG::21781", tileHeight: 256, tileWidth: 256, topLeftCorner: { lat: 30814423, lon: -29386322 } }, + { identifier: "8", matrixHeight: 208, matrixWidth: 208, scaleDenominator: 1000, supportedCRS: "urn:ogc:def:crs:EPSG::21781", tileHeight: 256, tileWidth: 256, topLeftCorner: { lat: 30814423, lon: -29386322 } }, + { identifier: "9", matrixHeight: 415, matrixWidth: 414, scaleDenominator: 500, supportedCRS: "urn:ogc:def:crs:EPSG::21781", tileHeight: 256, tileWidth: 256, topLeftCorner: { lat: 30814423, lon: -29386322 } } + ] + }; + + // Give main code a new bbox_strategy that translates between + // lat/lon and our swiss coordinates + fixmystreet.bbox_strategy = new OpenLayers.Strategy.ZurichBBOX({ratio: 1}); +} + +OpenLayers.Strategy.ZurichBBOX = OpenLayers.Class(OpenLayers.Strategy.BBOX, { + getMapBounds: function() { + // Get the map bounds but return them in lat/lon, not + // Swiss coordinates + if (this.layer.map === null) { + return null; + } + + var swissBounds = this.layer.map.getExtent(); + // Transform bound corners into WGS84 + swissBounds.transform( new OpenLayers.Projection("EPSG:21781"), new OpenLayers.Projection("EPSG:4326") ); + return swissBounds; + }, + + CLASS_NAME: "OpenLayers.Strategy.ZurichBBOX" +}); |
