From 54f5fbe4bf319e5c8fdb6377838afbc811431a90 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Wed, 27 Apr 2016 10:51:06 +0100 Subject: Allow change of email in admin to existing entry. --- perllib/FixMyStreet/App/Controller/Admin.pm | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm index f54a862ab..3e757f227 100644 --- a/perllib/FixMyStreet/App/Controller/Admin.pm +++ b/perllib/FixMyStreet/App/Controller/Admin.pm @@ -1135,9 +1135,21 @@ sub user_edit : Path('user_edit') : Args(1) { return; } - $user->update; - if ($edited) { - $c->forward( 'log_edit', [ $id, 'user', 'edit' ] ); + my $existing_user = $c->model('DB::User')->search({ email => $user->email, id => { '!=', $user->id } })->first; + if ($existing_user) { + foreach (qw(Problem Comment Alert)) { + $c->model("DB::$_") + ->search({ user_id => $user->id }) + ->update({ user_id => $existing_user->id }); + } + $user->delete; + $c->forward( 'log_edit', [ $id, 'user', 'merge' ] ); + $c->res->redirect( $c->uri_for( 'user_edit', $existing_user->id ) ); + } else { + $user->update; + if ($edited) { + $c->forward( 'log_edit', [ $id, 'user', 'edit' ] ); + } } $c->stash->{status_message} = -- cgit v1.2.3 From 8142ab98cb9e0c095f628e2d413fb0cc67753073 Mon Sep 17 00:00:00 2001 From: Zarino Zappia Date: Fri, 29 Apr 2016 17:36:26 +0100 Subject: [fixmystreet.com] Add standard mySociety footer. Like a number of recent council cobrands, we remove parts of the default desktop footer and append our own responsive one in `footer_extra.html`. This also updates the FixMyStreet app logos (for fixmystreet.com and any other cobrands that use them) to the most recent style of Apple / Google sanctioned badges. Fixes #1385. --- templates/web/base/footer.html | 3 - templates/web/bromley/footer.html | 3 - templates/web/fixmystreet.com/footer-nav.html | 24 --- templates/web/fixmystreet.com/footer_extra.html | 87 ++++++++ .../fixmystreet.com/front/footer-marketing.html | 15 -- templates/web/greenwich/footer.html | 3 - templates/web/harrogate/footer.html | 3 - web/cobrands/fixmystreet.com/_mysoc_footer.scss | 230 +++++++++++++++++++++ web/cobrands/fixmystreet.com/base.scss | 108 +++++++++- .../images/mysoc-footer/icon-facebook.png | Bin 0 -> 344 bytes .../images/mysoc-footer/icon-facebook.svg | 1 + .../images/mysoc-footer/icon-facebook@2x.png | Bin 0 -> 612 bytes .../images/mysoc-footer/icon-github.png | Bin 0 -> 526 bytes .../images/mysoc-footer/icon-github.svg | 1 + .../images/mysoc-footer/icon-github@2x.png | Bin 0 -> 994 bytes .../images/mysoc-footer/icon-twitter.png | Bin 0 -> 436 bytes .../images/mysoc-footer/icon-twitter.svg | 1 + .../images/mysoc-footer/icon-twitter@2x.png | Bin 0 -> 836 bytes .../images/mysoc-footer/logo-fms-platform.png | Bin 0 -> 2123 bytes .../images/mysoc-footer/logo-fms-platform.svg | 1 + .../images/mysoc-footer/logo-fms-platform@2x.png | Bin 0 -> 4787 bytes .../images/mysoc-footer/logo-mysociety.png | Bin 0 -> 2178 bytes .../images/mysoc-footer/logo-mysociety.svg | 1 + .../images/mysoc-footer/logo-mysociety@2x.png | Bin 0 -> 4340 bytes web/cobrands/fixmystreet.com/layout.scss | 75 +++---- .../fixmystreet/images/google_play_logo.png | Bin 4650 -> 3008 bytes .../fixmystreet/images/google_play_logo@2.png | Bin 0 -> 6575 bytes .../fixmystreet/images/itunes_store_logo.png | Bin 2123 -> 1793 bytes .../fixmystreet/images/itunes_store_logo@2.png | Bin 0 -> 3921 bytes 29 files changed, 459 insertions(+), 97 deletions(-) delete mode 100644 templates/web/fixmystreet.com/footer-nav.html create mode 100644 templates/web/fixmystreet.com/footer_extra.html create mode 100644 web/cobrands/fixmystreet.com/_mysoc_footer.scss create mode 100644 web/cobrands/fixmystreet.com/images/mysoc-footer/icon-facebook.png create mode 100644 web/cobrands/fixmystreet.com/images/mysoc-footer/icon-facebook.svg create mode 100644 web/cobrands/fixmystreet.com/images/mysoc-footer/icon-facebook@2x.png create mode 100644 web/cobrands/fixmystreet.com/images/mysoc-footer/icon-github.png create mode 100644 web/cobrands/fixmystreet.com/images/mysoc-footer/icon-github.svg create mode 100644 web/cobrands/fixmystreet.com/images/mysoc-footer/icon-github@2x.png create mode 100644 web/cobrands/fixmystreet.com/images/mysoc-footer/icon-twitter.png create mode 100644 web/cobrands/fixmystreet.com/images/mysoc-footer/icon-twitter.svg create mode 100644 web/cobrands/fixmystreet.com/images/mysoc-footer/icon-twitter@2x.png create mode 100644 web/cobrands/fixmystreet.com/images/mysoc-footer/logo-fms-platform.png create mode 100644 web/cobrands/fixmystreet.com/images/mysoc-footer/logo-fms-platform.svg create mode 100644 web/cobrands/fixmystreet.com/images/mysoc-footer/logo-fms-platform@2x.png create mode 100644 web/cobrands/fixmystreet.com/images/mysoc-footer/logo-mysociety.png create mode 100644 web/cobrands/fixmystreet.com/images/mysoc-footer/logo-mysociety.svg create mode 100644 web/cobrands/fixmystreet.com/images/mysoc-footer/logo-mysociety@2x.png create mode 100644 web/cobrands/fixmystreet/images/google_play_logo@2.png create mode 100644 web/cobrands/fixmystreet/images/itunes_store_logo@2.png diff --git a/templates/web/base/footer.html b/templates/web/base/footer.html index 7626736a0..c10d9c008 100644 --- a/templates/web/base/footer.html +++ b/templates/web/base/footer.html @@ -5,9 +5,6 @@ [% END %] - [% IF c.cobrand.moniker == 'fixmystreet' AND bodyclass != 'mappage' %] - [% INCLUDE 'footer-nav.html' %] - [% END %]
diff --git a/templates/web/bromley/footer.html b/templates/web/bromley/footer.html index 689871fff..6412ec03c 100644 --- a/templates/web/bromley/footer.html +++ b/templates/web/bromley/footer.html @@ -5,9 +5,6 @@ [% END %]
- [% IF c.cobrand.moniker == 'fixmystreet' AND bodyclass != 'mappage' %] - [% INCLUDE 'footer-nav.html' %] - [% END %]
diff --git a/templates/web/fixmystreet.com/footer-nav.html b/templates/web/fixmystreet.com/footer-nav.html deleted file mode 100644 index c85d1ea1e..000000000 --- a/templates/web/fixmystreet.com/footer-nav.html +++ /dev/null @@ -1,24 +0,0 @@ - diff --git a/templates/web/fixmystreet.com/footer_extra.html b/templates/web/fixmystreet.com/footer_extra.html new file mode 100644 index 000000000..d89910f90 --- /dev/null +++ b/templates/web/fixmystreet.com/footer_extra.html @@ -0,0 +1,87 @@ + diff --git a/templates/web/fixmystreet.com/front/footer-marketing.html b/templates/web/fixmystreet.com/front/footer-marketing.html index 717cc0bc9..74516b8be 100644 --- a/templates/web/fixmystreet.com/front/footer-marketing.html +++ b/templates/web/fixmystreet.com/front/footer-marketing.html @@ -1,20 +1,5 @@
- -
- [% IF c.cobrand.moniker == 'fixmystreet' AND bodyclass != 'mappage' %] - [% INCLUDE 'footer-nav.html' %] - [% END %]
diff --git a/templates/web/harrogate/footer.html b/templates/web/harrogate/footer.html index f262f6156..625096b32 100644 --- a/templates/web/harrogate/footer.html +++ b/templates/web/harrogate/footer.html @@ -5,9 +5,6 @@ [% END %]
- [% IF c.cobrand.moniker == 'fixmystreet' AND bodyclass != 'mappage' %] - [% INCLUDE 'footer-nav.html' %] - [% END %]
diff --git a/web/cobrands/fixmystreet.com/_mysoc_footer.scss b/web/cobrands/fixmystreet.com/_mysoc_footer.scss new file mode 100644 index 000000000..383ec5716 --- /dev/null +++ b/web/cobrands/fixmystreet.com/_mysoc_footer.scss @@ -0,0 +1,230 @@ +// Standard mySociety Footer v1.0.2 +// https://github.com/mysociety/standard-footer + +$mysoc-footer-background-color: #fff !default; +$mysoc-footer-text-color: #333 !default; +$mysoc-footer-site-name-text-color: $mysoc-footer-text-color !default; + +$mysoc-footer-link-text-color: #4FADED !default; +$mysoc-footer-link-hover-text-color: darken($mysoc-footer-link-text-color, 10%) !default; + +$mysoc-footer-site-name-font-size: 1.5em !default; +$mysoc-footer-site-name-margin-bottom: 0.5em !default; +$mysoc-footer-site-name-line-height: 1em !default; + +$mysoc-footer-border-top: none !default; +$mysoc-footer-divider-color: #E2DFD9 !default; + +$mysoc-footer-donate-background-color: #F3F1EB !default; +$mysoc-footer-donate-text-color: $mysoc-footer-text-color !default; +$mysoc-footer-donate-button-background-color: #999 !default; +$mysoc-footer-donate-button-text-color: #fff !default; +$mysoc-footer-donate-button-hover-background-color: darken($mysoc-footer-donate-button-background-color, 5%) !default; +$mysoc-footer-donate-button-hover-text-color: $mysoc-footer-donate-button-text-color !default; + +$mysoc-footer-legal-text-color: #6C6B68 !default; + +$mysoc-footer-image-path: '../img/mysoc-footer/' !default; +$mysoc-footer-breakpoint-sm: 768px !default; + +$high-dpi-screen: '-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi' !default; + +.mysoc-footer { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + background-color: $mysoc-footer-background-color; + color: $mysoc-footer-text-color; + padding: 2em 0; + font-size: 1em; + line-height: 1.5em; + border-top: $mysoc-footer-border-top; + + @media (min-height: 700px) { + padding: 3em 0; + } + + @media (min-height: 900px) { + padding: 4em 0; + } + + *, *:before, *:after { + -webkit-box-sizing: inherit; + -moz-box-sizing: inherit; + box-sizing: inherit; + } + + a { + color: $mysoc-footer-link-text-color; + + &:hover, + &:focus { + color: $mysoc-footer-link-hover-text-color; + } + } +} + +.mysoc-footer__divider { + border-top: 1px solid $mysoc-footer-divider-color; + margin: 2em 0; + + @media (min-height: 900px) { + margin: 3em 0; + } +} + +.mysoc-footer__site-name { + font-size: $mysoc-footer-site-name-font-size; + line-height: $mysoc-footer-site-name-line-height; + font-weight: bold; + margin: 0 0 $mysoc-footer-site-name-margin-bottom 0; + color: $mysoc-footer-site-name-text-color; +} + +.mysoc-footer__links { + font-size: 1em; + line-height: 1.2em; + + @media (min-width: $mysoc-footer-breakpoint-sm){ + overflow: auto; + margin: 0 -1em; + + // Line up top of .mysoc-footer__links with top of .mysoc-footer__site-description + $factor: $mysoc-footer-site-name-font-size / 1em; + padding-top: ( $mysoc-footer-site-name-line-height*$factor + $mysoc-footer-site-name-margin-bottom*$factor ); + } + + ul { + margin: 0; + padding: 0; + list-style: none; + + @media (min-width: $mysoc-footer-breakpoint-sm){ + float: left; + width: 50%; + padding: 0 1em; + } + } + + li { + margin: 0 0 0.5em 0; + } + + a { + display: block; + } +} + +.mysoc-footer__donate { + background-color: $mysoc-footer-donate-background-color; + color: $mysoc-footer-donate-text-color; + padding: 1.5em; + border-radius: 0.3em; + margin-top: 1em; + + @media (min-width: $mysoc-footer-breakpoint-sm){ + margin-top: 0; + } +} + +.mysoc-footer__donate__button { + display: inline-block; + background-color: $mysoc-footer-donate-button-background-color; + color: $mysoc-footer-donate-button-text-color !important; + padding: 0.5em 1em; + border-radius: 0.3em; + font-weight: bold; + text-decoration: none; + + &:hover, + &:focus { + text-decoration: none; + background-color: $mysoc-footer-donate-button-hover-background-color; + color: $mysoc-footer-donate-button-hover-text-color !important; + } +} + +.mysoc-footer__orgs { + overflow: auto; + margin: 0 -1em; +} + +.mysoc-footer__org { + float: left; + padding: 0 1em; +} + +.mysoc-footer__org__logo { + display: block; + margin-top: 0.5em; + height: 0; + overflow: hidden; + padding-top: 32px; +} + +.mysoc-footer__org__logo--mysociety { + width: 152px; + background: transparent url('#{$mysoc-footer-image-path}logo-mysociety.png') 0 0 no-repeat; + background-size: 152px 32px; + @media ($high-dpi-screen) { + background-image: url('#{$mysoc-footer-image-path}logo-mysociety@2x.png'); + } + background-image: url('#{$mysoc-footer-image-path}logo-mysociety.svg'), none; +} + +.mysoc-footer__legal { + font-size: 0.8em; + line-height: 1.5em; + color: $mysoc-footer-legal-text-color; +} + +.mysoc-footer__badges { + margin: 0 -4px; + padding: 0; + list-style: none; + + @media (min-width: $mysoc-footer-breakpoint-sm){ + text-align: right; + } + + li { + margin: 0 4px; + display: inline-block; + } +} + +.mysoc-footer__badge { + display: inline-block; + width: 32px; + height: 0; + padding-top: 32px; + overflow: hidden; + border-radius: 100%; +} + +.mysoc-footer__badge--github { + background: transparent url('#{$mysoc-footer-image-path}icon-github.png') 0 0 no-repeat; + background-size: 32px 32px; + @media ($high-dpi-screen) { + background-image: url('#{$mysoc-footer-image-path}icon-github@2x.png'); + } + background-image: url('#{$mysoc-footer-image-path}icon-github.svg'), none; +} + +.mysoc-footer__badge--twitter { + background: transparent url('#{$mysoc-footer-image-path}icon-twitter.png') 0 0 no-repeat; + background-size: 32px 32px; + @media ($high-dpi-screen) { + background-image: url('#{$mysoc-footer-image-path}icon-twitter@2x.png'); + } + background-image: url('#{$mysoc-footer-image-path}icon-twitter.svg'), none; +} + +.mysoc-footer__badge--facebook { + background: transparent url('#{$mysoc-footer-image-path}icon-facebook.png') 0 0 no-repeat; + background-size: 32px 32px; + @media ($high-dpi-screen) { + background-image: url('#{$mysoc-footer-image-path}icon-facebook@2x.png'); + } + background-image: url('#{$mysoc-footer-image-path}icon-facebook.svg'), none; +} diff --git a/web/cobrands/fixmystreet.com/base.scss b/web/cobrands/fixmystreet.com/base.scss index 820d5ffb5..223669b6d 100644 --- a/web/cobrands/fixmystreet.com/base.scss +++ b/web/cobrands/fixmystreet.com/base.scss @@ -9,10 +9,6 @@ @import "compass"; @import "../sass/base"; -#footer-nav { - display: none; -} - .top_banner { color: $primary_text; background: $primary; @@ -239,3 +235,107 @@ background: transparent; } } + +// Avoid double border between mobile nav and footer +.nav-menu--main > :last-child a { + border-bottom: none; +} + + +$mysoc-footer-background-color: #222; +$mysoc-footer-text-color: #acacac; +$mysoc-footer-site-name-text-color: #fff; + +$mysoc-footer-link-text-color: #fff; +$mysoc-footer-link-hover-text-color: #fff; + +$mysoc-footer-border-top: 0.25em solid $primary; + +$mysoc-footer-divider-color: #4b4b4b; + +$mysoc-footer-donate-background-color: #333; +$mysoc-footer-donate-text-color: #fff; +$mysoc-footer-donate-button-background-color: $primary; +$mysoc-footer-donate-button-text-color: #000; + +$mysoc-footer-legal-text-color: #9a9a9a; + +$mysoc-footer-image-path: 'images/mysoc-footer/'; +$mysoc-footer-breakpoint-sm: 48em; + +$grid-max-width: 60em; +$grid-gutter: 2em; +$grid-breakpoint-sm: $mysoc-footer-breakpoint-sm; + +@import "mysoc_footer"; + +.mysoc-footer { + li { + list-style: none; + } + + .container { + margin: 0 auto; + } + + .container { + margin-right: auto; + margin-left: auto; + padding-left: $grid-gutter / 2; + padding-right: $grid-gutter / 2; + max-width: $grid-max-width; + } + + .row { + @include clearfix(); + margin-left: $grid-gutter / -2; + margin-right: $grid-gutter / -2; + } + + %col { + padding-left: $grid-gutter / 2; + padding-right: $grid-gutter / 2; + } + + @for $i from 1 through 12 { + .col-sm-#{$i} { + @extend %col; + } + } + + @media(min-width: $grid-breakpoint-sm) { + %col-float { + float: left; + } + + @for $i from 1 through 12 { + .col-sm-#{$i} { + @extend %col-float; + width: 100% / 12 * $i; + } + } + } +} + +.mysoc-footer__org__logo--fms-platform { + width: 205px; + background: transparent url('#{$mysoc-footer-image-path}logo-fms-platform.png') 0 0 no-repeat; + background-size: 205px 32px; + @media ($high-dpi-screen) { + background-image: url('#{$mysoc-footer-image-path}logo-fms-platform@2x.png'); + } + background-image: url('#{$mysoc-footer-image-path}logo-fms-platform.svg'), none; +} + +.fms-app-badges { + margin: 1em 0; + + a { + text-decoration: none; + } + + img { + border: none; + margin-right: 0.5em; + } +} diff --git a/web/cobrands/fixmystreet.com/images/mysoc-footer/icon-facebook.png b/web/cobrands/fixmystreet.com/images/mysoc-footer/icon-facebook.png new file mode 100644 index 000000000..2459b1fb8 Binary files /dev/null and b/web/cobrands/fixmystreet.com/images/mysoc-footer/icon-facebook.png differ diff --git a/web/cobrands/fixmystreet.com/images/mysoc-footer/icon-facebook.svg b/web/cobrands/fixmystreet.com/images/mysoc-footer/icon-facebook.svg new file mode 100644 index 000000000..002a243a7 --- /dev/null +++ b/web/cobrands/fixmystreet.com/images/mysoc-footer/icon-facebook.svg @@ -0,0 +1 @@ +icon-facebook-white \ No newline at end of file diff --git a/web/cobrands/fixmystreet.com/images/mysoc-footer/icon-facebook@2x.png b/web/cobrands/fixmystreet.com/images/mysoc-footer/icon-facebook@2x.png new file mode 100644 index 000000000..137878d77 Binary files /dev/null and b/web/cobrands/fixmystreet.com/images/mysoc-footer/icon-facebook@2x.png differ diff --git a/web/cobrands/fixmystreet.com/images/mysoc-footer/icon-github.png b/web/cobrands/fixmystreet.com/images/mysoc-footer/icon-github.png new file mode 100644 index 000000000..179f29ec9 Binary files /dev/null and b/web/cobrands/fixmystreet.com/images/mysoc-footer/icon-github.png differ diff --git a/web/cobrands/fixmystreet.com/images/mysoc-footer/icon-github.svg b/web/cobrands/fixmystreet.com/images/mysoc-footer/icon-github.svg new file mode 100644 index 000000000..09cc2f40e --- /dev/null +++ b/web/cobrands/fixmystreet.com/images/mysoc-footer/icon-github.svg @@ -0,0 +1 @@ +icon-github-white \ No newline at end of file diff --git a/web/cobrands/fixmystreet.com/images/mysoc-footer/icon-github@2x.png b/web/cobrands/fixmystreet.com/images/mysoc-footer/icon-github@2x.png new file mode 100644 index 000000000..e6d0d4124 Binary files /dev/null and b/web/cobrands/fixmystreet.com/images/mysoc-footer/icon-github@2x.png differ diff --git a/web/cobrands/fixmystreet.com/images/mysoc-footer/icon-twitter.png b/web/cobrands/fixmystreet.com/images/mysoc-footer/icon-twitter.png new file mode 100644 index 000000000..5fb0578ab Binary files /dev/null and b/web/cobrands/fixmystreet.com/images/mysoc-footer/icon-twitter.png differ diff --git a/web/cobrands/fixmystreet.com/images/mysoc-footer/icon-twitter.svg b/web/cobrands/fixmystreet.com/images/mysoc-footer/icon-twitter.svg new file mode 100644 index 000000000..bc2dc1e08 --- /dev/null +++ b/web/cobrands/fixmystreet.com/images/mysoc-footer/icon-twitter.svg @@ -0,0 +1 @@ +icon-twitter-white \ No newline at end of file diff --git a/web/cobrands/fixmystreet.com/images/mysoc-footer/icon-twitter@2x.png b/web/cobrands/fixmystreet.com/images/mysoc-footer/icon-twitter@2x.png new file mode 100644 index 000000000..1bd1d4bb6 Binary files /dev/null and b/web/cobrands/fixmystreet.com/images/mysoc-footer/icon-twitter@2x.png differ diff --git a/web/cobrands/fixmystreet.com/images/mysoc-footer/logo-fms-platform.png b/web/cobrands/fixmystreet.com/images/mysoc-footer/logo-fms-platform.png new file mode 100644 index 000000000..dda825fc2 Binary files /dev/null and b/web/cobrands/fixmystreet.com/images/mysoc-footer/logo-fms-platform.png differ diff --git a/web/cobrands/fixmystreet.com/images/mysoc-footer/logo-fms-platform.svg b/web/cobrands/fixmystreet.com/images/mysoc-footer/logo-fms-platform.svg new file mode 100644 index 000000000..ae1dad681 --- /dev/null +++ b/web/cobrands/fixmystreet.com/images/mysoc-footer/logo-fms-platform.svg @@ -0,0 +1 @@ +logo-fms-platform \ No newline at end of file diff --git a/web/cobrands/fixmystreet.com/images/mysoc-footer/logo-fms-platform@2x.png b/web/cobrands/fixmystreet.com/images/mysoc-footer/logo-fms-platform@2x.png new file mode 100644 index 000000000..bdb8eb121 Binary files /dev/null and b/web/cobrands/fixmystreet.com/images/mysoc-footer/logo-fms-platform@2x.png differ diff --git a/web/cobrands/fixmystreet.com/images/mysoc-footer/logo-mysociety.png b/web/cobrands/fixmystreet.com/images/mysoc-footer/logo-mysociety.png new file mode 100644 index 000000000..51596b929 Binary files /dev/null and b/web/cobrands/fixmystreet.com/images/mysoc-footer/logo-mysociety.png differ diff --git a/web/cobrands/fixmystreet.com/images/mysoc-footer/logo-mysociety.svg b/web/cobrands/fixmystreet.com/images/mysoc-footer/logo-mysociety.svg new file mode 100644 index 000000000..aa3484c3f --- /dev/null +++ b/web/cobrands/fixmystreet.com/images/mysoc-footer/logo-mysociety.svg @@ -0,0 +1 @@ +mysociety-logo-white \ No newline at end of file diff --git a/web/cobrands/fixmystreet.com/images/mysoc-footer/logo-mysociety@2x.png b/web/cobrands/fixmystreet.com/images/mysoc-footer/logo-mysociety@2x.png new file mode 100644 index 000000000..600a20fd6 Binary files /dev/null and b/web/cobrands/fixmystreet.com/images/mysoc-footer/logo-mysociety@2x.png differ diff --git a/web/cobrands/fixmystreet.com/layout.scss b/web/cobrands/fixmystreet.com/layout.scss index 14eccfd1e..3802d96d7 100644 --- a/web/cobrands/fixmystreet.com/layout.scss +++ b/web/cobrands/fixmystreet.com/layout.scss @@ -207,41 +207,6 @@ body.twothirdswidthpage { } } -#footer-nav { - display: block; - border: 0px; - border-top: 0.25em solid #ffd000; - border-image: url(images/tile-y.jpg) 30 0 repeat; - - .tablewrapper { - max-width: 60em; - margin: 0 auto; - background: $base_bg; - ul { - @include list-reset-soft; - float: $left; - li { - display: inline; - float: $left; - a, span { - display: block; - color: $nav_fg; - background: none; - border-bottom: none; - padding: 0.75em; - font-size: 0.9em; - } - } - } - #footer-main-nav { - display: block; - } - #footer-help-nav { - float: $right; - } - } -} - .next-steps { @include clearfix; margin-bottom: 2em; // add some space between this and the footer @@ -324,6 +289,33 @@ body.unresponsive-council { } } +// FMS.com has a slightly different version of the +// footer-help / footer-marketing widgets that appear +// at the bottom of pages with `pagefooter` set. +#footer-help { + border: none; + + ul { + margin: 0 auto; + + li { + max-width: 19em; + + &:last-child { + border: none; + padding-left: 3em; + } + } + } +} + +.mysoc-footer { + margin-top: 3em; +} +body.mappage .mysoc-footer { + display: none; +} + .variant1 { body { background: #fad52a url(/cobrands/fixmystreet.com/images/friendly-homepage.jpg) top center no-repeat; @@ -422,21 +414,20 @@ body.unresponsive-council { color: #222; background: #fad52a; } - body.fullwidthpage .container .content footer .tablewrapper, - #footer-nav .tablewrapper { + body.fullwidthpage .container .content footer .tablewrapper { color: #222; background: transparent; } - #footer-nav .tablewrapper ul li a, - #footer-nav .tablewrapper ul li span { - color: #222; - } - .nav-menu--mysoc { background: #fff; } + #footer-help a { + color: inherit; + text-decoration: underline; + } + #mysoc-logo { background-image: url(/cobrands/fixmystreet.com/images/friendly-mysoc-logo.png); background-position: 50% 0%; diff --git a/web/cobrands/fixmystreet/images/google_play_logo.png b/web/cobrands/fixmystreet/images/google_play_logo.png index 893ec5727..b1e774859 100644 Binary files a/web/cobrands/fixmystreet/images/google_play_logo.png and b/web/cobrands/fixmystreet/images/google_play_logo.png differ diff --git a/web/cobrands/fixmystreet/images/google_play_logo@2.png b/web/cobrands/fixmystreet/images/google_play_logo@2.png new file mode 100644 index 000000000..dfeb5a9a4 Binary files /dev/null and b/web/cobrands/fixmystreet/images/google_play_logo@2.png differ diff --git a/web/cobrands/fixmystreet/images/itunes_store_logo.png b/web/cobrands/fixmystreet/images/itunes_store_logo.png index 395769502..b65d5a5a4 100644 Binary files a/web/cobrands/fixmystreet/images/itunes_store_logo.png and b/web/cobrands/fixmystreet/images/itunes_store_logo.png differ diff --git a/web/cobrands/fixmystreet/images/itunes_store_logo@2.png b/web/cobrands/fixmystreet/images/itunes_store_logo@2.png new file mode 100644 index 000000000..af616aada Binary files /dev/null and b/web/cobrands/fixmystreet/images/itunes_store_logo@2.png differ -- cgit v1.2.3 From 8eaf26c962c4941a302975630035c24f1e5f55ef Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Tue, 10 May 2016 16:30:55 +0100 Subject: Improve printing of report page in Firefox. For some reason if the content is floated, Firefox leaves a very large gap that actually blanks out the content underneath it. --- web/cobrands/sass/_base.scss | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss index eaa0113a5..6af6d88ff 100644 --- a/web/cobrands/sass/_base.scss +++ b/web/cobrands/sass/_base.scss @@ -1819,7 +1819,11 @@ table.nicetable { margin: 3em; } - #main-nav, + // Firefox leaves a big blanking gap if the content is floated... + .content { float: none !important; } + + .shadow-wrap, + .nav-wrapper, #nav-link, .admin-nav, .olControlAttribution, -- cgit v1.2.3 From a0c620b2f4e19dd2a46dcf42ba4c5ec70af49410 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Tue, 17 May 2016 17:06:35 +0100 Subject: Update OpenLayers to fix Google Maps layer. This uses the master branch of OpenLayers 2. --- templates/web/base/maps/google-ol.html | 4 +- web/js/OpenLayers.fixmystreet.google.js | 633 ++++++++++++++++++-------------- web/js/map-google-ol.js | 10 +- 3 files changed, 366 insertions(+), 281 deletions(-) diff --git a/templates/web/base/maps/google-ol.html b/templates/web/base/maps/google-ol.html index 7c83534a8..a87c87afb 100644 --- a/templates/web/base/maps/google-ol.html +++ b/templates/web/base/maps/google-ol.html @@ -1,5 +1,5 @@ [% map_js = BLOCK %] - + @@ -10,7 +10,7 @@ [% END %] [% map_sub_links = BLOCK %] -[% loc('Map') %] +[% loc('Satellite') %] [% END %] [% map_html = BLOCK %] diff --git a/web/js/OpenLayers.fixmystreet.google.js b/web/js/OpenLayers.fixmystreet.google.js index 183497b2a..ba7c79e82 100644 --- a/web/js/OpenLayers.fixmystreet.google.js +++ b/web/js/OpenLayers.fixmystreet.google.js @@ -2,15 +2,15 @@ OpenLayers.js -- OpenLayers Map Viewer Library - Copyright (c) 2006-2013 by OpenLayers Contributors + Copyright (c) 2006-2015 by OpenLayers Contributors Published under the 2-clause BSD license. - See http://openlayers.org/dev/license.txt for the full text of the license, - and http://openlayers.org/dev/authors.txt for full list of contributors. + See https://raw.githubusercontent.com/openlayers/ol2/master/license.txt for the full text of the license, + and https://raw.githubusercontent.com/openlayers/ol2/master/authors.txt for full list of contributors. Includes compressed code under the following licenses: (For uncompressed versions of the code used, please see the - OpenLayers Github repository: ) + OpenLayers Github repository: ) */ @@ -30,35 +30,43 @@ * Code licensed under the BSD License: * http://developer.yahoo.com/yui/license.html */ -var OpenLayers={VERSION_NUMBER:"Release 2.13.1",singleFile:!0,_getScriptLocation:function(){return "/js/OpenLayers-2.13.1/"},ImgPath:""};OpenLayers.Class=function(){var a=arguments.length,b=arguments[0],c=arguments[a-1],d="function"==typeof c.initialize?c.initialize:function(){b.prototype.initialize.apply(this,arguments)};1this.right)this.right=a.right;if(null==this.top||a.top>this.top)this.top=a.top}},extendXY:function(a,b){this.centerLonLat=null;if(null==this.left||athis.right)this.right=a;if(null==this.top||b>this.top)this.top=b},containsLonLat:function(a,b){"boolean"===typeof b&&(b={inclusive:b});b=b||{};var c=this.contains(a.lon,a.lat,b.inclusive),d=b.worldBounds;d&&!c&&(c=d.getWidth(), -d=Math.round((a.lon-(d.left+d.right)/2)/c),c=this.containsLonLat({lon:a.lon-d*c,lat:a.lat},{inclusive:b.inclusive}));return c},containsPixel:function(a,b){return this.contains(a.x,a.y,b)},contains:function(a,b,c){null==c&&(c=!0);if(null==a||null==b)return!1;a=OpenLayers.Util.toFloat(a);b=OpenLayers.Util.toFloat(b);var d=!1;return d=c?a>=this.left&&a<=this.right&&b>=this.bottom&&b<=this.top:a>this.left&&athis.bottom&&b=c.bottom&&a.top<=c.top||c.top>a.bottom&&c.top=c.left&&a.left<=c.right||c.left>=a.left&&c.left<=a.right,f=a.right>=c.left&&a.right<=c.right||c.right>=a.left&&c.right<=a.right,d=(a.bottom>=c.bottom&&a.bottom<=c.top||c.bottom>= -a.bottom&&c.bottom<=a.top||d)&&(e||f);if(b.worldBounds&&!d){var g=b.worldBounds,e=g.getWidth(),f=!g.containsBounds(c),g=!g.containsBounds(a);f&&!g?(a=a.add(-e,0),d=c.intersectsBounds(a,{inclusive:b.inclusive})):g&&!f&&(c=c.add(-e,0),d=a.intersectsBounds(c,{inclusive:b.inclusive}))}return d},containsBounds:function(a,b,c){null==b&&(b=!1);null==c&&(c=!0);var d=this.contains(a.left,a.bottom,c),e=this.contains(a.right,a.bottom,c),f=this.contains(a.left,a.top,c);a=this.contains(a.right,a.top,c);return b? -d||e||f||a:d&&e&&f&&a},determineQuadrant:function(a){var b="",c=this.getCenterLonLat(),b=b+(a.lat=this.left&&a<=this.right&&b>=this.bottom&&b<=this.top:a>this.left&&athis.bottom&&b=c.bottom&&a.top<=c.top||c.top>a.bottom&&c.top=c.left&&a.left<=c.right||c.left>=a.left&&c.left<=a.right,f=a.right>=c.left&&a.right<=c.right||c.right>=a.left&&c.right<=a.right,d=(a.bottom>=c.bottom&&a.bottom<=c.top||c.bottom>=a.bottom&& +c.bottom<=a.top||d)&&(e||f);if(b.worldBounds&&!d){var g=b.worldBounds,e=g.getWidth(),f=!g.containsBounds(c),g=!g.containsBounds(a);f&&!g?(a=a.add(-e,0),d=c.intersectsBounds(a,{inclusive:b.inclusive})):g&&!f&&(c=c.add(-e,0),d=a.intersectsBounds(c,{inclusive:b.inclusive}))}return d},containsBounds:function(a,b,c){null==b&&(b=!1);null==c&&(c=!0);var d=this.contains(a.left,a.bottom,c),e=this.contains(a.right,a.bottom,c),f=this.contains(a.left,a.top,c);a=this.contains(a.right,a.top,c);return b?d||e||f|| +a:d&&e&&f&&a},determineQuadrant:function(a){var b="",c=this.getCenterLonLat(),b=b+(a.lat=a.right&&e.right>a.right;)e=e.add(-f,0);c=e.left+c;ca.left&&e.right-d>a.right&&(e=e.add(-f,0))}return e},CLASS_NAME:"OpenLayers.Bounds"}); -OpenLayers.Bounds.fromString=function(a,b){var c=a.split(",");return OpenLayers.Bounds.fromArray(c,b)};OpenLayers.Bounds.fromArray=function(a,b){return!0===b?new OpenLayers.Bounds(a[1],a[0],a[3],a[2]):new OpenLayers.Bounds(a[0],a[1],a[2],a[3])};OpenLayers.Bounds.fromSize=function(a){return new OpenLayers.Bounds(0,a.h,a.w,0)};OpenLayers.Bounds.oppositeQuadrant=function(a){var b;b=""+("t"==a.charAt(0)?"b":"t");return b+="l"==a.charAt(1)?"r":"l"};OpenLayers.Element={visible:function(a){return"none"!=OpenLayers.Util.getElement(a).style.display},toggle:function(){for(var a=0,b=arguments.length;aa.right;)b.lon-=a.getWidth()}return b},CLASS_NAME:"OpenLayers.LonLat"}); -OpenLayers.LonLat.fromString=function(a){a=a.split(",");return new OpenLayers.LonLat(a[0],a[1])};OpenLayers.LonLat.fromArray=function(a){var b=OpenLayers.Util.isArray(a);return new OpenLayers.LonLat(b&&a[0],b&&a[1])};OpenLayers.Pixel=OpenLayers.Class({x:0,y:0,initialize:function(a,b){this.x=parseFloat(a);this.y=parseFloat(b)},toString:function(){return"x="+this.x+",y="+this.y},clone:function(){return new OpenLayers.Pixel(this.x,this.y)},equals:function(a){var b=!1;null!=a&&(b=this.x==a.x&&this.y==a.y||isNaN(this.x)&&isNaN(this.y)&&isNaN(a.x)&&isNaN(a.y));return b},distanceTo:function(a){return Math.sqrt(Math.pow(this.x-a.x,2)+Math.pow(this.y-a.y,2))},add:function(a,b){if(null==a||null==b)throw new TypeError("Pixel.add cannot receive null values"); -return new OpenLayers.Pixel(this.x+a,this.y+b)},offset:function(a){var b=this.clone();a&&(b=this.add(a.x,a.y));return b},CLASS_NAME:"OpenLayers.Pixel"});OpenLayers.Size=OpenLayers.Class({w:0,h:0,initialize:function(a,b){this.w=parseFloat(a);this.h=parseFloat(b)},toString:function(){return"w="+this.w+",h="+this.h},clone:function(){return new OpenLayers.Size(this.w,this.h)},equals:function(a){var b=!1;null!=a&&(b=this.w==a.w&&this.h==a.h||isNaN(this.w)&&isNaN(this.h)&&isNaN(a.w)&&isNaN(a.h));return b},CLASS_NAME:"OpenLayers.Size"});OpenLayers.Console={log:function(){},debug:function(){},info:function(){},warn:function(){},error:function(){},userError:function(a){alert(a)},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(){for(var a=document.getElementsByTagName("script"),b=0,c=a.length;bparseFloat(h)?(a.style.filter="alpha(opacity="+100*h+")",a.style.opacity=h):1==parseFloat(h)&&(a.style.filter="",a.style.opacity="")}; OpenLayers.Util.createDiv=function(a,b,c,d,e,f,g,h){var k=document.createElement("div");d&&(k.style.backgroundImage="url("+d+")");a||(a=OpenLayers.Util.createUniqueID("OpenLayersDiv"));e||(e="absolute");OpenLayers.Util.modifyDOMElement(k,a,b,c,e,f,g,h);return k}; -OpenLayers.Util.createImage=function(a,b,c,d,e,f,g,h){var k=document.createElement("img");a||(a=OpenLayers.Util.createUniqueID("OpenLayersDiv"));e||(e="relative");OpenLayers.Util.modifyDOMElement(k,a,b,c,e,f,null,g);h&&(k.style.display="none",b=function(){k.style.display="";OpenLayers.Event.stopObservingElement(k)},OpenLayers.Event.observe(k,"load",b),OpenLayers.Event.observe(k,"error",b));k.style.alt=a;k.galleryImg="no";d&&(k.src=d);return k};OpenLayers.IMAGE_RELOAD_ATTEMPTS=0; +OpenLayers.Util.createImage=function(a,b,c,d,e,f,g,h){var k=document.createElement("img");a||(a=OpenLayers.Util.createUniqueID("OpenLayersDiv"));e||(e="relative");OpenLayers.Util.modifyDOMElement(k,a,b,c,e,f,null,g);h&&(b=function(){k.style.display="";OpenLayers.Event.stopObservingElement(k)},k.style.display="none",OpenLayers.Event.observe(k,"load",b),OpenLayers.Event.observe(k,"error",b));k.style.alt=a;k.galleryImg="no";d&&(k.src=d);return k};OpenLayers.IMAGE_RELOAD_ATTEMPTS=0; OpenLayers.Util.alphaHackNeeded=null;OpenLayers.Util.alphaHack=function(){if(null==OpenLayers.Util.alphaHackNeeded){var a=navigator.appVersion.split("MSIE"),a=parseFloat(a[1]),b=!1;try{b=!!document.body.filters}catch(c){}OpenLayers.Util.alphaHackNeeded=b&&5.5<=a&&7>a}return OpenLayers.Util.alphaHackNeeded}; OpenLayers.Util.modifyAlphaImageDiv=function(a,b,c,d,e,f,g,h,k){OpenLayers.Util.modifyDOMElement(a,b,c,d,f,null,null,k);b=a.childNodes[0];e&&(b.src=e);OpenLayers.Util.modifyDOMElement(b,a.id+"_innerImage",null,d,"relative",g);OpenLayers.Util.alphaHack()&&("none"!=a.style.display&&(a.style.display="inline-block"),null==h&&(h="scale"),a.style.filter="progid:DXImageTransform.Microsoft.AlphaImageLoader(src='"+b.src+"', sizingMethod='"+h+"')",0<=parseFloat(a.style.opacity)&&1>parseFloat(a.style.opacity)&& (a.style.filter+=" alpha(opacity="+100*a.style.opacity+")"),b.style.filter="alpha(opacity=0)")};OpenLayers.Util.createAlphaImageDiv=function(a,b,c,d,e,f,g,h,k){var l=OpenLayers.Util.createDiv();k=OpenLayers.Util.createImage(null,null,null,null,null,null,null,k);k.className="olAlphaImg";l.appendChild(k);OpenLayers.Util.modifyAlphaImageDiv(l,a,b,c,d,e,f,g,h);return l};OpenLayers.Util.upperCaseObject=function(a){var b={},c;for(c in a)b[c.toUpperCase()]=a[c];return b}; @@ -67,19 +75,19 @@ OpenLayers.Util.getParameterString=function(a){var b=[],c;for(c in a){var d=a[c] OpenLayers.Util.getImagesLocation=function(){return OpenLayers.ImgPath||OpenLayers._getScriptLocation()+"img/"};OpenLayers.Util.getImageLocation=function(a){return OpenLayers.Util.getImagesLocation()+a};OpenLayers.Util.Try=function(){for(var a=null,b=0,c=arguments.length;be&&(e="0"+e);e+="\u00b0";0<=c.indexOf("dm")&&(10>d&&(d="0"+d),e+=d+"'",0<=c.indexOf("dms")&&(10>f&&(f="0"+f),e+=f+'"'));return e="lon"==b?e+(0>a?OpenLayers.i18n("W"):OpenLayers.i18n("E")):e+(0>a?OpenLayers.i18n("S"):OpenLayers.i18n("N"))};OpenLayers.Feature=OpenLayers.Class({layer:null,id:null,lonlat:null,data:null,marker:null,popupClass:null,popup:null,initialize:function(a,b,c){this.layer=a;this.lonlat=b;this.data=null!=c?c:{};this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_")},destroy:function(){null!=this.layer&&null!=this.layer.map&&null!=this.popup&&this.layer.map.removePopup(this.popup);null!=this.layer&&null!=this.marker&&this.layer.removeMarker(this.marker);this.data=this.lonlat=this.id=this.layer=null;null!=this.marker&& +OpenLayers.Util.getFormattedLonLat=function(a,b,c){c||(c="dms");a=(a+540)%360-180;var d=Math.abs(a),e=Math.floor(d),f=d=(d-e)/(1/60),d=Math.floor(d),f=Math.round((f-d)/(1/60)*10),f=f/10;60<=f&&(f-=60,d+=1,60<=d&&(d-=60,e+=1));10>e&&(e="0"+e);e+="\u00b0";0<=c.indexOf("dm")&&(10>d&&(d="0"+d),e+=d+"'",0<=c.indexOf("dms")&&(10>f&&(f="0"+f),e+=f+'"'));return e="lon"==b?e+(0>a?OpenLayers.i18n("W"):OpenLayers.i18n("E")):e+(0>a?OpenLayers.i18n("S"):OpenLayers.i18n("N"))}; +OpenLayers.Util.getConstructor=function(a){var b=a.split(".");a="OpenLayers"===b[0]?OpenLayers:window[b[0]];for(var c=1,d=b.length;cthis.maxZIndex&&(this.maxZIndex=b)},getNextElement:function(a){a+=1;if(athis.maxZIndex&&(this.maxZIndex=b)},getNextElement:function(a){a+=1;for(var b=void 0;aa.left&&f.righta.left&&f.left=2*a[1]?"longdash":1==a[0]||1==a[1]?"dot":"dash":4==a.length?1*a[0]>=2*a[1]?"longdashdot":"dashdot":"solid"}},createNode:function(a,b){var c=document.createElement(a);b&&(c.id=b);c.unselectable="on";c.onselectstart=OpenLayers.Function.False;return c},nodeTypeCompare:function(a,b){var c=b,d=c.indexOf(":");-1!=d&&(c=c.substr(d+1));var e=a.nodeName,d=e.indexOf(":");-1!=d&&(e=e.substr(d+1));return c==e},createRenderRoot:function(){return this.nodeFactory(this.container.id+ "_vmlRoot","div")},createRoot:function(a){return this.nodeFactory(this.container.id+a,"olv:group")},drawPoint:function(a,b){return this.drawCircle(a,b,1)},drawCircle:function(a,b,c){if(!isNaN(b.x)&&!isNaN(b.y)){var d=this.getResolution();a.style.left=((b.x-this.featureDx)/d-this.offset.x|0)-c+"px";a.style.top=(b.y/d-this.offset.y|0)-c+"px";b=2*c;a.style.width=b+"px";a.style.height=b+"px";return a}return!1},drawLineString:function(a,b){return this.drawLine(a,b,!1)},drawLinearRing:function(a,b){return this.drawLine(a, -b,!0)},drawLine:function(a,b,c){this.setNodeDimension(a,b);for(var d=this.getResolution(),e=b.components.length,f=Array(e),g,h,k=0;kthis.duration&&this.stop()},CLASS_NAME:"OpenLayers.Tween"});OpenLayers.Easing={CLASS_NAME:"OpenLayers.Easing"};OpenLayers.Easing.Linear={easeIn:function(a,b,c,d){return c*a/d+b},easeOut:function(a,b,c,d){return c*a/d+b},easeInOut:function(a,b,c,d){return c*a/d+b},CLASS_NAME:"OpenLayers.Easing.Linear"}; OpenLayers.Easing.Expo={easeIn:function(a,b,c,d){return 0==a?b:c*Math.pow(2,10*(a/d-1))+b},easeOut:function(a,b,c,d){return a==d?b+c:c*(-Math.pow(2,-10*a/d)+1)+b},easeInOut:function(a,b,c,d){return 0==a?b:a==d?b+c:1>(a/=d/2)?c/2*Math.pow(2,10*(a-1))+b:c/2*(-Math.pow(2,-10*--a)+2)+b},CLASS_NAME:"OpenLayers.Easing.Expo"}; -OpenLayers.Easing.Quad={easeIn:function(a,b,c,d){return c*(a/=d)*a+b},easeOut:function(a,b,c,d){return-c*(a/=d)*(a-2)+b},easeInOut:function(a,b,c,d){return 1>(a/=d/2)?c/2*a*a+b:-c/2*(--a*(a-2)-1)+b},CLASS_NAME:"OpenLayers.Easing.Quad"};OpenLayers.Geometry=OpenLayers.Class({id:null,parent:null,bounds:null,initialize:function(){this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_")},destroy:function(){this.bounds=this.id=null},clone:function(){return new OpenLayers.Geometry},setBounds:function(a){a&&(this.bounds=a.clone())},clearBounds:function(){this.bounds=null;this.parent&&this.parent.clearBounds()},extendBounds:function(a){this.getBounds()?this.bounds.extend(a):this.setBounds(a)},getBounds:function(){null==this.bounds&&this.calculateBounds(); +OpenLayers.Easing.Quad={easeIn:function(a,b,c,d){return c*(a/=d)*a+b},easeOut:function(a,b,c,d){return-c*(a/=d)*(a-2)+b},easeInOut:function(a,b,c,d){return 1>(a/=d/2)?c/2*a*a+b:-c/2*(--a*(a-2)-1)+b},CLASS_NAME:"OpenLayers.Easing.Quad"}; +OpenLayers.Geometry=OpenLayers.Class({id:null,parent:null,bounds:null,initialize:function(){this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_")},destroy:function(){this.bounds=this.id=null},clone:function(){return new OpenLayers.Geometry},setBounds:function(a){a&&(this.bounds=a.clone())},clearBounds:function(){this.bounds=null;this.parent&&this.parent.clearBounds()},extendBounds:function(a){this.getBounds()?this.bounds.extend(a):this.setBounds(a)},getBounds:function(){null==this.bounds&&this.calculateBounds(); return this.bounds},calculateBounds:function(){},distanceTo:function(a,b){},getVertices:function(a){},atPoint:function(a,b,c){var d=!1;null!=this.getBounds()&&null!=a&&(b=null!=b?b:0,c=null!=c?c:0,d=(new OpenLayers.Bounds(this.bounds.left-b,this.bounds.bottom-c,this.bounds.right+b,this.bounds.top+c)).containsLonLat(a));return d},getLength:function(){return 0},getArea:function(){return 0},getCentroid:function(){return null},toString:function(){return OpenLayers.Format&&OpenLayers.Format.WKT?OpenLayers.Format.WKT.prototype.write(new OpenLayers.Feature.Vector(this)): Object.prototype.toString.call(this)},CLASS_NAME:"OpenLayers.Geometry"});OpenLayers.Geometry.fromWKT=function(a){var b;if(OpenLayers.Format&&OpenLayers.Format.WKT){var c=OpenLayers.Geometry.fromWKT.format;c||(c=new OpenLayers.Format.WKT,OpenLayers.Geometry.fromWKT.format=c);a=c.read(a);if(a instanceof OpenLayers.Feature.Vector)b=a.geometry;else if(OpenLayers.Util.isArray(a)){b=a.length;for(var c=Array(b),d=0;d=f&&0<=q&&1>=q&&(d?(h=a.x1+f*h,q=a.y1+f*k,e=new OpenLayers.Geometry.Point(h,q)):e=!0));if(c)if(e){if(d)a:for(a=[a,b],b=0;2>b;++b)for(f=a[b],k=1;3>k;++k)if(h=f["x"+k],q=f["y"+k],d=Math.sqrt(Math.pow(h-e.x,2)+Math.pow(q-e.y,2)),db;++b)for(h=a[b],q=a[(b+1)%2],k=1;3>k;++k)if(f={x:h["x"+k],y:h["y"+k]},g=OpenLayers.Geometry.distanceToSegment(f,q),g.distance=m||(1<=m?(e=g,f=h):(e+=m*k,f+=m*l));return{distance:Math.pow(e-c,2)+Math.pow(f-d,2),x:e,y:f,along:m}};OpenLayers.Geometry.Collection=OpenLayers.Class(OpenLayers.Geometry,{components:null,componentTypes:null,initialize:function(a){OpenLayers.Geometry.prototype.initialize.apply(this,arguments);this.components=[];null!=a&&this.addComponents(a)},destroy:function(){this.components.length=0;this.components=null;OpenLayers.Geometry.prototype.destroy.apply(this,arguments)},clone:function(){for(var a=eval("new "+this.CLASS_NAME+"()"),b=0,c=this.components.length;b=m||(1<=m?(e=g,f=h):(e+=m*k,f+=m*l));return{distance:Math.pow(e-c,2)+Math.pow(f-d,2),x:e,y:f,along:m}}; +OpenLayers.Geometry.Collection=OpenLayers.Class(OpenLayers.Geometry,{components:null,componentTypes:null,initialize:function(a){OpenLayers.Geometry.prototype.initialize.apply(this,arguments);this.components=[];null!=a&&this.addComponents(a)},destroy:function(){this.components.length=0;this.components=null;OpenLayers.Geometry.prototype.destroy.apply(this,arguments)},clone:function(){for(var a=new (OpenLayers.Util.getConstructor(this.CLASS_NAME)),b=0,c=this.components.length;bf)break;if(!(k.x2Math.max(g,h)||Math.max(l,m)h&&(k>l.y1&&kl.y2))break;e=c?{distance:e.distance,x0:e.x,y0:e.y,x1:h,y1:k}:e.distance}else if(a instanceof OpenLayers.Geometry.LineString){var g=this.getSortedSegments(),h=a.getSortedSegments(),p,n,r=h.length,s={point:!0},m=0,q=g.length;a:for(;mb.length)return this;var c=function(a,b,d,k){for(var l=0,m=0,q=b,p;ql&&(l=p,m=q)}l>k&&m!=b&&(e.push(m),c(a,b,m,k),c(a,m,d,k))},d=b.length-1,e=[];e.push(0);for(e.push(d);b[0].equals(b[d]);)d--,e.push(d);c(b,0,d,a);a=[];e.sort(function(a,b){return a-b});for(d=0;df)break;if(!(k.x2Math.max(g,h)||Math.max(l,m)b.length)return this;var c=function(a,b,d,k){for(var l=0,m=0,q=b,r;ql&&(l=r,m=q)}l>k&&m!=b&&(e.push(m),c(a,b,m,k),c(a,m,d,k))},d=b.length-1,e=[];e.push(0);for(e.push(d);b[0].equals(b[d]);)d--,e.push(d);c(b,0,d,a);a=[];e.sort(function(a,b){return a-b});for(d=0;d=a)return this.components[0].clone();if(2=g&&c<=h||g>=h&&c<=g&&c>=h)){l=-1;break}}else{k=b((a-f)*((h-g)/(f-e))+h,14);if(k== -c&&(e=e&&a<=f||e>f&&a<=e&&a>=f)){l=-1;break}k<=c||g!=h&&(kMath.max(g,h))||(e=e&&af&&a=f)&&++l}return-1==l?1:!!(l&1)},intersects:function(a){var b=!1;if("OpenLayers.Geometry.Point"==a.CLASS_NAME)b=this.containsPoint(a);else if("OpenLayers.Geometry.LineString"==a.CLASS_NAME)b=a.intersects(this);else if("OpenLayers.Geometry.LinearRing"==a.CLASS_NAME)b=OpenLayers.Geometry.LineString.prototype.intersects.apply(this,[a]);else for(var c=0,d=a.components.length;c< -d&&!(b=a.components[c].intersects(this));++c);return b},getVertices:function(a){return!0===a?[]:this.components.slice(0,this.components.length-1)},CLASS_NAME:"OpenLayers.Geometry.LinearRing"});OpenLayers.Geometry.Polygon=OpenLayers.Class(OpenLayers.Geometry.Collection,{componentTypes:["OpenLayers.Geometry.LinearRing"],getArea:function(){var a=0;if(this.components&&0=g&&c<=h||g>=h&&c<=g&& +c>=h)){l=-1;break}}else{k=b((h-g)/(f-e)*(a-f)+h,14);if(k==c&&(e=e&&a<=f||e>f&&a<=e&&a>=f)){l=-1;break}k<=c||g!=h&&(kMath.max(g,h))||(e=e&&af&&a=f)&&++l}return-1==l?1:!!(l&1)},intersects:function(a){var b=!1;if("OpenLayers.Geometry.Point"==a.CLASS_NAME)b=this.containsPoint(a);else if("OpenLayers.Geometry.LineString"==a.CLASS_NAME)b=a.intersects(this);else if("OpenLayers.Geometry.LinearRing"==a.CLASS_NAME)b=OpenLayers.Geometry.LineString.prototype.intersects.apply(this, +[a]);else for(var c=0,d=a.components.length;cMath.floor(a.pageY)||0===a.pageX&&Math.floor(d)>Math.floor(a.pageX))d-=c,e-=b;else if(eMath.floor(a.pageY)||0===a.pageX&&Math.floor(d)>Math.floor(a.pageX))d-=c,e-=b;else if(e=this.clientWidth||Math.ceil(a.clientY)>=this.clientHeight)&&d.splice(b,1);break}})},addPointerTouchListenerMove:function(a,b,c){var d=this._pointerTouches;OpenLayers.Event.observe(a,this.getTouchModel()===this.TOUCH_MODEL_MSPOINTER?"MSPointerMove":"pointermove",function(a){if(OpenLayers.Event.isTouchEvent(a)&&(1!=d.length||d[0].pageX!=a.pageX||d[0].pageY!=a.pageY)){for(var b=0,g= +d.length;bb?b=0:b>this.layers.length&&(b=this.layers.length);if(c!=b){this.layers.splice(c,1);this.layers.splice(b,0,a);for(var c=0,d=this.layers.length;c=this.minPx.x+h?Math.round(a):0;b=f<=this.maxPx.y-k&&f>=this.minPx.y+k?Math.round(b):0;if(a||b){this.dragging||(this.dragging=!0,this.events.triggerEvent("movestart")); -this.center=null;a&&(this.layerContainerOriginPx.x-=a,this.minPx.x-=a,this.maxPx.x-=a);b&&(this.layerContainerOriginPx.y-=b,this.minPx.y-=b,this.maxPx.y-=b);this.applyTransform();d=0;for(e=this.layers.length;dc)if(this.fractionalZoom)a=this.getZoomForResolution(c);else for(var d=a|0,e=b.length;dthis.restrictedExtent.getWidth()?a=new OpenLayers.LonLat(g.lon,a.lat):f.leftthis.restrictedExtent.right&& -(a=a.add(this.restrictedExtent.right-f.right,0));f.getHeight()>this.restrictedExtent.getHeight()?a=new OpenLayers.LonLat(a.lon,g.lat):f.bottomthis.restrictedExtent.top&&(a=a.add(0,this.restrictedExtent.top-f.top))}}e=e||this.isValidZoomLevel(b)&&b!=this.getZoom();f=this.isValidLonLat(a)&&!a.equals(this.center);if(e||f||d){d||this.events.triggerEvent("movestart",{zoomChanged:e});f&&(!e&&this.center&&this.centerLayerContainer(a), -this.center=a.clone());a=e?this.getResolutionForZoom(b):this.getResolution();if(e||null==this.layerContainerOrigin){this.layerContainerOrigin=this.getCachedCenter();this.layerContainerOriginPx.x=0;this.layerContainerOriginPx.y=0;this.applyTransform();var f=this.getMaxExtent({restricted:!0}),h=f.getCenterLonLat(),g=this.center.lon-h.lon,h=h.lat-this.center.lat,k=Math.round(f.getWidth()/a),l=Math.round(f.getHeight()/a);this.minPx={x:(this.size.w-k)/2-g/a,y:(this.size.h-l)/2-h/a};this.maxPx={x:this.minPx.x+ -Math.round(f.getWidth()/a),y:this.minPx.y+Math.round(f.getHeight()/a)}}e&&(this.zoom=b,this.resolution=a);a=this.getExtent();this.baseLayer.visibility&&(this.baseLayer.moveTo(a,e,c.dragging),c.dragging||this.baseLayer.events.triggerEvent("moveend",{zoomChanged:e}));a=this.baseLayer.getExtent();for(b=this.layers.length-1;0<=b;--b)f=this.layers[b],f===this.baseLayer||f.isBaseLayer||(g=f.calculateInRange(),f.inRange!=g&&((f.inRange=g)||f.display(!1),this.events.triggerEvent("changelayer",{layer:f,property:"visibility"})), -g&&f.visibility&&(f.moveTo(a,e,c.dragging),c.dragging||f.events.triggerEvent("moveend",{zoomChanged:e})));this.events.triggerEvent("move");d||this.events.triggerEvent("moveend");if(e){b=0;for(c=this.popups.length;bb?b=0:b>this.layers.length&&(b=this.layers.length);if(c!=b){this.layers.splice(c,1);this.layers.splice(b,0,a);for(var c=0,d=this.layers.length;c=this.minPx.x+h?Math.round(a):0;b=f<=this.maxPx.y-k&&f>=this.minPx.y+k?Math.round(b):0;if(a||b){this.dragging||(this.dragging=!0,this.events.triggerEvent("movestart"));this.center=null;a&&(this.layerContainerOriginPx.x-=a,this.minPx.x-=a,this.maxPx.x-=a);b&&(this.layerContainerOriginPx.y-=b,this.minPx.y-=b,this.maxPx.y-=b);this.applyTransform();d=0;for(e=this.layers.length;dc)if(this.fractionalZoom)a=this.getZoomForResolution(c);else for(var d=a|0,e=b.length;dthis.restrictedExtent.getWidth()?a=new OpenLayers.LonLat(g.lon,a.lat):f.leftthis.restrictedExtent.right&&(a=a.add(this.restrictedExtent.right-f.right,0));f.getHeight()>this.restrictedExtent.getHeight()?a=new OpenLayers.LonLat(a.lon,g.lat):f.bottomthis.restrictedExtent.top&&(a=a.add(0,this.restrictedExtent.top-f.top))}}e= +e||this.isValidZoomLevel(b)&&b!=this.getZoom();f=this.isValidLonLat(a)&&!a.equals(this.center);if(e||f||d){d||this.events.triggerEvent("movestart",{zoomChanged:e});f&&(!e&&this.center&&this.centerLayerContainer(a),this.center=a.clone());a=e?this.getResolutionForZoom(b):this.getResolution();if(e||null==this.layerContainerOrigin){this.layerContainerOrigin=this.getCachedCenter();this.layerContainerOriginPx.x=0;this.layerContainerOriginPx.y=0;this.applyTransform();var f=this.getMaxExtent({restricted:!0}), +h=f.getCenterLonLat(),g=this.center.lon-h.lon,h=h.lat-this.center.lat,k=Math.round(f.getWidth()/a),l=Math.round(f.getHeight()/a);this.minPx={x:(this.size.w-k)/2-g/a,y:(this.size.h-l)/2-h/a};this.maxPx={x:this.minPx.x+Math.round(f.getWidth()/a),y:this.minPx.y+Math.round(f.getHeight()/a)}}e&&(this.zoom=b,this.resolution=a);a=this.getExtent();this.baseLayer.visibility&&(this.baseLayer.moveTo(a,e,c.dragging),c.dragging||this.baseLayer.events.triggerEvent("moveend",{zoomChanged:e}));a=this.baseLayer.getExtent(); +for(b=this.layers.length-1;0<=b;--b)f=this.layers[b],f===this.baseLayer||f.isBaseLayer||(g=f.calculateInRange(),f.inRange!=g&&((f.inRange=g)||f.display(!1),this.events.triggerEvent("changelayer",{layer:f,property:"visibility"})),g&&f.visibility&&(f.moveTo(a,e,c.dragging),c.dragging||f.events.triggerEvent("moveend",{zoomChanged:e})));this.events.triggerEvent("move");d||this.events.triggerEvent("moveend");if(e){b=0;for(c=this.popups.length;b=this.minResolution&&a<=this.maxResolution);return a},setIsBaseLayer:function(a){a!=this.isBaseLayer&&(this.isBaseLayer= -a,null!=this.map&&this.map.events.triggerEvent("changebaselayer",{layer:this}))},initResolutions:function(){var a,b,c,d={},e=!0;a=0;for(b=this.RESOLUTION_PROPERTIES.length;a=a||"number"!==typeof d&&"number"!==typeof c)){b=Array(a);var e=2;"number"==typeof c&&"number"==typeof d&&(e=Math.pow(d/c,1/(a-1)));var f;if("number"===typeof d)for(f=0;f=a&&(f=h,e=c),h<=a){g=h;break}c=f-g;c=0f)break;f=e}else if(this.resolutions[c]=this.minResolution&&a<=this.maxResolution);return a},setIsBaseLayer:function(a){a!= +this.isBaseLayer&&(this.isBaseLayer=a,null!=this.map&&this.map.events.triggerEvent("changebaselayer",{layer:this}))},initResolutions:function(){var a,b,c,d={},e=!0;a=0;for(b=this.RESOLUTION_PROPERTIES.length;a=a||"number"!==typeof d&&"number"!==typeof c)){b=Array(a);var e=2;"number"==typeof c&&"number"==typeof d&&(e=Math.pow(d/c,1/(a-1)));var f;if("number"===typeof d)for(f=0;f=a&&(f=h,e=c),h<=a){g=h;break}c=f-g;c=0f)break;f=e}else if(this.resolutions[c]=a.count&& this.removeGMapElements()}OpenLayers.Layer.EventPane.prototype.destroy.apply(this,arguments)},removeGMapElements:function(){var a=OpenLayers.Layer.Google.cache[this.map.id];if(a){var b=this.mapObject&&this.getMapContainer();b&&b.parentNode&&b.parentNode.removeChild(b);(b=a.termsOfUse)&&b.parentNode&&b.parentNode.removeChild(b);(a=a.poweredBy)&&a.parentNode&&a.parentNode.removeChild(a);this.mapObject&&window.google&&google.maps&&google.maps.event&&google.maps.event.clearListeners&&google.maps.event.clearListeners(this.mapObject, @@ -307,47 +344,56 @@ e.hostname,d=d[4],e=e.port;if(80!=d&&""!=d||"80"!=e&&""!=e)c=c&&d==e}c||b&&(a="f "XMLHttpRequest");var d=new OpenLayers.Request.XMLHttpRequest,e=OpenLayers.Util.urlAppend(a.url,OpenLayers.Util.getParameterString(a.params||{})),e=OpenLayers.Request.makeSameOrigin(e,a.proxy);d.open(a.method,e,a.async,a.user,a.password);for(var f in a.headers)d.setRequestHeader(f,a.headers[f]);var g=this.events,h=this;d.onreadystatechange=function(){d.readyState==OpenLayers.Request.XMLHttpRequest.DONE&&!1!==g.triggerEvent("complete",{request:d,config:a,requestUrl:e})&&h.runCallbacks({request:d,config:a, requestUrl:e})};!1===a.async?d.send(a.data):window.setTimeout(function(){0!==d.readyState&&d.send(a.data)},0);return d},runCallbacks:function(a){var b=a.request,c=a.config,d=c.scope?OpenLayers.Function.bind(c.callback,c.scope):c.callback,e;c.success&&(e=c.scope?OpenLayers.Function.bind(c.success,c.scope):c.success);var f;c.failure&&(f=c.scope?OpenLayers.Function.bind(c.failure,c.scope):c.failure);"file:"==OpenLayers.Util.createUrlObject(c.url).protocol&&b.responseText&&(b.status=200);d(b);if(!b.status|| 200<=b.status&&300>b.status)this.events.triggerEvent("success",a),e&&e(b);b.status&&(200>b.status||300<=b.status)&&(this.events.triggerEvent("failure",a),f&&f(b))},GET:function(a){a=OpenLayers.Util.extend(a,{method:"GET"});return OpenLayers.Request.issue(a)},POST:function(a){a=OpenLayers.Util.extend(a,{method:"POST"});a.headers=a.headers?a.headers:{};"CONTENT-TYPE"in OpenLayers.Util.upperCaseObject(a.headers)||(a.headers["Content-Type"]="application/xml");return OpenLayers.Request.issue(a)},PUT:function(a){a= -OpenLayers.Util.extend(a,{method:"PUT"});a.headers=a.headers?a.headers:{};"CONTENT-TYPE"in OpenLayers.Util.upperCaseObject(a.headers)||(a.headers["Content-Type"]="application/xml");return OpenLayers.Request.issue(a)},DELETE:function(a){a=OpenLayers.Util.extend(a,{method:"DELETE"});return OpenLayers.Request.issue(a)},HEAD:function(a){a=OpenLayers.Util.extend(a,{method:"HEAD"});return OpenLayers.Request.issue(a)},OPTIONS:function(a){a=OpenLayers.Util.extend(a,{method:"OPTIONS"});return OpenLayers.Request.issue(a)}});(function(){function a(){this._object=f&&!k?new f:new window.ActiveXObject("Microsoft.XMLHTTP");this._listeners=[]}function b(){return new a}function c(a){b.onreadystatechange&&b.onreadystatechange.apply(a);a.dispatchEvent({type:"readystatechange",bubbles:!1,cancelable:!1,timeStamp:new Date+0})}function d(a){try{a.responseText=a._object.responseText}catch(b){}try{var c;var d=a._object,e=d.responseXML,f=d.responseText;h&&f&&e&&!e.documentElement&&d.getResponseHeader("Content-Type").match(/[^\/]+\/[^\+]+\+xml/)&& -(e=new window.ActiveXObject("Microsoft.XMLDOM"),e.async=!1,e.validateOnParse=!1,e.loadXML(f));c=e&&(h&&0!=e.parseError||!e.documentElement||e.documentElement&&"parsererror"==e.documentElement.tagName)?null:e;a.responseXML=c}catch(g){}try{a.status=a._object.status}catch(k){}try{a.statusText=a._object.statusText}catch(u){}}function e(a){a._object.onreadystatechange=new window.Function}var f=window.XMLHttpRequest,g=!!window.controllers,h=window.document.all&&!window.opera,k=h&&window.navigator.userAgent.match(/MSIE 7.0/); -b.prototype=a.prototype;g&&f.wrapped&&(b.wrapped=f.wrapped);b.UNSENT=0;b.OPENED=1;b.HEADERS_RECEIVED=2;b.LOADING=3;b.DONE=4;b.prototype.readyState=b.UNSENT;b.prototype.responseText="";b.prototype.responseXML=null;b.prototype.status=0;b.prototype.statusText="";b.prototype.priority="NORMAL";b.prototype.onreadystatechange=null;b.onreadystatechange=null;b.onopen=null;b.onsend=null;b.onabort=null;b.prototype.open=function(a,f,k,p,n){delete this._headers;3>arguments.length&&(k=!0);this._async=k;var r=this, -s=this.readyState,t;h&&k&&(t=function(){s!=b.DONE&&(e(r),r.abort())},window.attachEvent("onunload",t));b.onopen&&b.onopen.apply(this,arguments);4arguments.length&&(k=!0);this._async=k;var p=this, +u=this.readyState,t;h&&k&&(t=function(){u!=b.DONE&&(e(p),p.abort())},window.attachEvent("onunload",t));b.onopen&&b.onopen.apply(this,arguments);4b.UNSENT&&(this._aborted=!0);this._object.abort();e(this);this.readyState=b.UNSENT;delete this._data};b.prototype.getAllResponseHeaders=function(){return this._object.getAllResponseHeaders()};b.prototype.getResponseHeader=function(a){return this._object.getResponseHeader(a)};b.prototype.setRequestHeader=function(a,b){this._headers||(this._headers={});this._headers[a]=b;return this._object.setRequestHeader(a,b)}; b.prototype.addEventListener=function(a,b,c){for(var d=0,e;e=this._listeners[d];d++)if(e[0]==a&&e[1]==b&&e[2]==c)return;this._listeners.push([a,b,c])};b.prototype.removeEventListener=function(a,b,c){for(var d=0,e;(e=this._listeners[d])&&(e[0]!=a||e[1]!=b||e[2]!=c);d++);e&&this._listeners.splice(d,1)};b.prototype.dispatchEvent=function(a){a={type:a.type,target:this,currentTarget:this,eventPhase:2,bubbles:a.bubbles,cancelable:a.cancelable,timeStamp:a.timeStamp,stopPropagation:function(){},preventDefault:function(){}, initEvent:function(){}};"readystatechange"==a.type&&this.onreadystatechange&&(this.onreadystatechange.handleEvent||this.onreadystatechange).apply(this,[a]);for(var b=0,c;c=this._listeners[b];b++)c[0]!=a.type||c[2]||(c[1].handleEvent||c[1]).apply(this,[a])};b.prototype.toString=function(){return"[object XMLHttpRequest]"};b.toString=function(){return"[XMLHttpRequest]"};window.Function.prototype.apply||(window.Function.prototype.apply=function(a,b){b||(b=[]);a.__func=this;a.__func(b[0],b[1],b[2],b[3], -b[4]);delete a.__func});OpenLayers.Request||(OpenLayers.Request={});OpenLayers.Request.XMLHttpRequest=b})();OpenLayers.Protocol.HTTP=OpenLayers.Class(OpenLayers.Protocol,{url:null,headers:null,params:null,callback:null,scope:null,readWithPOST:!1,updateWithPOST:!1,deleteWithPOST:!1,wildcarded:!1,srsInBBOX:!1,initialize:function(a){a=a||{};this.params={};this.headers={};OpenLayers.Protocol.prototype.initialize.apply(this,arguments);if(!this.filterToParams&&OpenLayers.Format.QueryStringFilter){var b=new OpenLayers.Format.QueryStringFilter({wildcarded:this.wildcarded,srsInBBOX:this.srsInBBOX});this.filterToParams= +b[4]);delete a.__func});OpenLayers.Request||(OpenLayers.Request={});OpenLayers.Request.XMLHttpRequest=b})(); +OpenLayers.Protocol.HTTP=OpenLayers.Class(OpenLayers.Protocol,{url:null,headers:null,params:null,callback:null,scope:null,readWithPOST:!1,updateWithPOST:!1,deleteWithPOST:!1,wildcarded:!1,srsInBBOX:!1,initialize:function(a){a=a||{};this.params={};this.headers={};OpenLayers.Protocol.prototype.initialize.apply(this,arguments);if(!this.filterToParams&&OpenLayers.Format.QueryStringFilter){var b=new OpenLayers.Format.QueryStringFilter({wildcarded:this.wildcarded,srsInBBOX:this.srsInBBOX});this.filterToParams= function(a,d){return b.write(a,d)}}},destroy:function(){this.headers=this.params=null;OpenLayers.Protocol.prototype.destroy.apply(this)},read:function(a){OpenLayers.Protocol.prototype.read.apply(this,arguments);a=a||{};a.params=OpenLayers.Util.applyDefaults(a.params,this.options.params);a=OpenLayers.Util.applyDefaults(a,this.options);a.filter&&this.filterToParams&&(a.params=this.filterToParams(a.filter,a.params));var b=void 0!==a.readWithPOST?a.readWithPOST:this.readWithPOST,c=new OpenLayers.Protocol.Response({requestType:"read"}); b?(b=a.headers||{},b["Content-Type"]="application/x-www-form-urlencoded",c.priv=OpenLayers.Request.POST({url:a.url,callback:this.createCallback(this.handleRead,c,a),data:OpenLayers.Util.getParameterString(a.params),headers:b})):c.priv=OpenLayers.Request.GET({url:a.url,callback:this.createCallback(this.handleRead,c,a),params:a.params,headers:a.headers});return c},handleRead:function(a,b){this.handleResponse(a,b)},create:function(a,b){b=OpenLayers.Util.applyDefaults(b,this.options);var c=new OpenLayers.Protocol.Response({reqFeatures:a, requestType:"create"});c.priv=OpenLayers.Request.POST({url:b.url,callback:this.createCallback(this.handleCreate,c,b),headers:b.headers,data:this.format.write(a)});return c},handleCreate:function(a,b){this.handleResponse(a,b)},update:function(a,b){b=b||{};var c=b.url||a.url||this.options.url+"/"+a.fid;b=OpenLayers.Util.applyDefaults(b,this.options);var d=new OpenLayers.Protocol.Response({reqFeatures:a,requestType:"update"});d.priv=OpenLayers.Request[this.updateWithPOST?"POST":"PUT"]({url:c,callback:this.createCallback(this.handleUpdate, d,b),headers:b.headers,data:this.format.write(a)});return d},handleUpdate:function(a,b){this.handleResponse(a,b)},"delete":function(a,b){b=b||{};var c=b.url||a.url||this.options.url+"/"+a.fid;b=OpenLayers.Util.applyDefaults(b,this.options);var d=new OpenLayers.Protocol.Response({reqFeatures:a,requestType:"delete"}),e=this.deleteWithPOST?"POST":"DELETE",c={url:c,callback:this.createCallback(this.handleDelete,d,b),headers:b.headers};this.deleteWithPOST&&(c.data=this.format.write(a));d.priv=OpenLayers.Request[e](c); return d},handleDelete:function(a,b){this.handleResponse(a,b)},handleResponse:function(a,b){var c=a.priv;b.callback&&(200<=c.status&&300>c.status?("delete"!=a.requestType&&(a.features=this.parseFeatures(c)),a.code=OpenLayers.Protocol.Response.SUCCESS):a.code=OpenLayers.Protocol.Response.FAILURE,b.callback.call(b.scope,a))},parseFeatures:function(a){var b=a.responseXML;b&&b.documentElement||(b=a.responseText);return!b||0>=b.length?null:this.format.read(b)},commit:function(a,b){function c(a){for(var b= -a.features?a.features.length:0,c=Array(b),e=0;e=p&&b.callback&&(r.code=n?OpenLayers.Protocol.Response.SUCCESS:OpenLayers.Protocol.Response.FAILURE,b.callback.apply(b.scope,[r]))}b=OpenLayers.Util.applyDefaults(b,this.options);var e=[],f=0,g={};g[OpenLayers.State.INSERT]=[];g[OpenLayers.State.UPDATE]=[];g[OpenLayers.State.DELETE]=[];for(var h,k,l=[],m=0,q=a.length;m=r&&b.callback&&(p.code=n?OpenLayers.Protocol.Response.SUCCESS:OpenLayers.Protocol.Response.FAILURE,b.callback.apply(b.scope,[p]))}b=OpenLayers.Util.applyDefaults(b,this.options);var e=[],f=0,g={};g[OpenLayers.State.INSERT]=[];g[OpenLayers.State.UPDATE]=[];g[OpenLayers.State.DELETE]=[];for(var h,k,l=[],m=0,q=a.length;ma?"0"+a:a}return'"'+a.getFullYear()+ -"-"+b(a.getMonth()+1)+"-"+b(a.getDate())+"T"+b(a.getHours())+":"+b(a.getMinutes())+":"+b(a.getSeconds())+'"'}},CLASS_NAME:"OpenLayers.Format.JSON"});OpenLayers.Format.XML=OpenLayers.Class(OpenLayers.Format,{namespaces:null,namespaceAlias:null,defaultPrefix:null,readers:{},writers:{},xmldom:null,initialize:function(a){window.ActiveXObject&&(this.xmldom=new ActiveXObject("Microsoft.XMLDOM"));OpenLayers.Format.prototype.initialize.apply(this,[a]);this.namespaces=OpenLayers.Util.extend({},this.namespaces);this.namespaceAlias={};for(var b in this.namespaces)this.namespaceAlias[this.namespaces[b]]=b},destroy:function(){this.xmldom=null;OpenLayers.Format.prototype.destroy.apply(this, -arguments)},setNamespace:function(a,b){this.namespaces[a]=b;this.namespaceAlias[b]=a},read:function(a){var b=a.indexOf("<");0=OpenLayers.Style.createLiteral(this.minScaleDenominator,b));c&&this.maxScaleDenominator&&(c=da.w-this.map.paddingForPopups.right&&(c.x=a.w-this.map.paddingForPopups.right-this.size.w); b.ya.h-this.map.paddingForPopups.bottom&&(c.y=a.h-this.map.paddingForPopups.bottom-this.size.h);this.map.pan(b.x-c.x,b.y-c.y)},registerEvents:function(){this.events=new OpenLayers.Events(this,this.div,null,!0);this.events.on({mousedown:this.onmousedown,mousemove:this.onmousemove,mouseup:this.onmouseup,click:this.onclick,mouseout:this.onmouseout,dblclick:this.ondblclick,touchstart:function(a){OpenLayers.Event.stop(a,!0)}, scope:this})},onmousedown:function(a){this.mousedown=!0;OpenLayers.Event.stop(a,!0)},onmousemove:function(a){this.mousedown&&OpenLayers.Event.stop(a,!0)},onmouseup:function(a){this.mousedown&&(this.mousedown=!1,OpenLayers.Event.stop(a,!0))},onclick:function(a){OpenLayers.Event.stop(a,!0)},onmouseout:function(a){this.mousedown=!1},ondblclick:function(a){OpenLayers.Event.stop(a,!0)},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:!0,anchor:null,initialize:function(a,b,c,d,e,f,g){OpenLayers.Popup.prototype.initialize.apply(this,[a,b,c,d,f,g]);this.anchor=null!=e?e:{size:new OpenLayers.Size(0,0),offset:new OpenLayers.Pixel(0,0)}},destroy:function(){this.relativePosition=this.anchor=null;OpenLayers.Popup.prototype.destroy.apply(this,arguments)},show:function(){this.updatePosition();OpenLayers.Popup.prototype.show.apply(this,arguments)}, +OpenLayers.Popup.OPACITY=1;OpenLayers.Popup.BORDER="0px"; +OpenLayers.Popup.Anchored=OpenLayers.Class(OpenLayers.Popup,{relativePosition:null,keepInMap:!0,anchor:null,initialize:function(a,b,c,d,e,f,g){OpenLayers.Popup.prototype.initialize.apply(this,[a,b,c,d,f,g]);this.anchor=null!=e?e:{size:new OpenLayers.Size(0,0),offset:new OpenLayers.Pixel(0,0)}},destroy:function(){this.relativePosition=this.anchor=null;OpenLayers.Popup.prototype.destroy.apply(this,arguments)},show:function(){this.updatePosition();OpenLayers.Popup.prototype.show.apply(this,arguments)}, moveTo:function(a){var b=this.relativePosition;this.relativePosition=this.calculateRelativePosition(a);OpenLayers.Popup.prototype.moveTo.call(this,this.calculateNewPx(a));this.relativePosition!=b&&this.updateRelativePosition()},setSize:function(a){OpenLayers.Popup.prototype.setSize.apply(this,arguments);if(this.lonlat&&this.map){var b=this.map.getLayerPxFromLonLat(this.lonlat);this.moveTo(b)}},calculateRelativePosition:function(a){a=this.map.getLonLatFromLayerPx(a);a=this.map.getExtent().determineQuadrant(a); -return OpenLayers.Bounds.oppositeQuadrant(a)},updateRelativePosition:function(){},calculateNewPx:function(a){a=a.offset(this.anchor.offset);var b=this.size||this.contentSize,c="t"==this.relativePosition.charAt(0);a.y+=c?-b.h:this.anchor.size.h;c="l"==this.relativePosition.charAt(1);a.x+=c?-b.w:this.anchor.size.w;return a},CLASS_NAME:"OpenLayers.Popup.Anchored"});OpenLayers.Popup.Framed=OpenLayers.Class(OpenLayers.Popup.Anchored,{imageSrc:null,imageSize:null,isAlphaImage:!1,positionBlocks:null,blocks:null,fixedRelativePosition:!1,initialize:function(a,b,c,d,e,f,g){OpenLayers.Popup.Anchored.prototype.initialize.apply(this,arguments);this.fixedRelativePosition&&(this.updateRelativePosition(),this.calculateRelativePosition=function(a){return this.relativePosition});this.contentDiv.style.position="absolute";this.contentDiv.style.zIndex=1;f&&(this.closeDiv.style.zIndex= +return OpenLayers.Bounds.oppositeQuadrant(a)},updateRelativePosition:function(){},calculateNewPx:function(a){a=a.offset(this.anchor.offset);var b=this.size||this.contentSize,c="t"==this.relativePosition.charAt(0);a.y+=c?-b.h:this.anchor.size.h;c="l"==this.relativePosition.charAt(1);a.x+=c?-b.w:this.anchor.size.w;return a},CLASS_NAME:"OpenLayers.Popup.Anchored"}); +OpenLayers.Popup.Framed=OpenLayers.Class(OpenLayers.Popup.Anchored,{imageSrc:null,imageSize:null,isAlphaImage:!1,positionBlocks:null,blocks:null,fixedRelativePosition:!1,initialize:function(a,b,c,d,e,f,g){OpenLayers.Popup.Anchored.prototype.initialize.apply(this,arguments);this.fixedRelativePosition&&(this.updateRelativePosition(),this.calculateRelativePosition=function(a){return this.relativePosition});this.contentDiv.style.position="absolute";this.contentDiv.style.zIndex=1;f&&(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.isAlphaImage=this.imageSize=this.imageSrc=null;this.fixedRelativePosition=!1;this.positionBlocks=null;for(var a=0;ak?0:k)+"px";d.div.style.height=(0>l?0:l)+"px";d.div.style.left=null!=e?e+"px":"";d.div.style.bottom=null!=f?f+"px":"";d.div.style.right=null!=g?g+"px":"";d.div.style.top=null!=h?h+"px":"";d.image.style.left=c.position.x+"px";d.image.style.top=c.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.Popup.FramedCloud=OpenLayers.Class(OpenLayers.Popup.Framed,{contentDisplayClass:"olFramedCloudPopupContent",autoSize:!0,panMapIfOutOfView:!0,imageSize:new OpenLayers.Size(1276,736),isAlphaImage:!1,fixedRelativePosition:!1,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, +h):c.size.h;d.div.style.width=(0>k?0:k)+"px";d.div.style.height=(0>l?0:l)+"px";d.div.style.left=null!=e?e+"px":"";d.div.style.bottom=null!=f?f+"px":"";d.div.style.right=null!=g?g+"px":"";d.div.style.top=null!=h?h+"px":"";d.image.style.left=c.position.x+"px";d.image.style.top=c.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.Popup.FramedCloud=OpenLayers.Class(OpenLayers.Popup.Framed,{contentDisplayClass:"olFramedCloudPopupContent",autoSize:!0,panMapIfOutOfView:!0,imageSize:new OpenLayers.Size(1276,736),isAlphaImage:!1,fixedRelativePosition:!1,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(a,b,c,d,e,f,g){this.imageSrc=OpenLayers.Util.getImageLocation("cloud-popup-relative.png"); -OpenLayers.Popup.Framed.prototype.initialize.apply(this,arguments);this.contentDiv.className=this.contentDisplayClass},CLASS_NAME:"OpenLayers.Popup.FramedCloud"});OpenLayers.Handler=OpenLayers.Class({id:null,control:null,map:null,keyMask:null,active:!1,evt:null,touch:!1,initialize:function(a,b,c){OpenLayers.Util.extend(this,c);this.control=a;this.callbacks=b;(a=this.map||a.map)&&this.setMap(a);this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_")},setMap:function(a){this.map=a},checkModifiers:function(a){return null==this.keyMask?!0:((a.shiftKey?OpenLayers.Handler.MOD_SHIFT:0)|(a.ctrlKey?OpenLayers.Handler.MOD_CTRL:0)|(a.altKey?OpenLayers.Handler.MOD_ALT: +OpenLayers.Popup.Framed.prototype.initialize.apply(this,arguments);this.contentDiv.className=this.contentDisplayClass},CLASS_NAME:"OpenLayers.Popup.FramedCloud"}); +OpenLayers.Handler=OpenLayers.Class({id:null,control:null,map:null,keyMask:null,active:!1,evt:null,touch:!1,initialize:function(a,b,c){OpenLayers.Util.extend(this,c);this.control=a;this.callbacks=b;(a=this.map||a.map)&&this.setMap(a);this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_")},setMap:function(a){this.map=a},checkModifiers:function(a){return null==this.keyMask?!0:((a.shiftKey?OpenLayers.Handler.MOD_SHIFT:0)|(a.ctrlKey?OpenLayers.Handler.MOD_CTRL:0)|(a.altKey?OpenLayers.Handler.MOD_ALT: 0)|(a.metaKey?OpenLayers.Handler.MOD_META:0))==this.keyMask},activate:function(){if(this.active)return!1;for(var a=OpenLayers.Events.prototype.BROWSER_EVENTS,b=0,c=a.length;b=this.map.Z_INDEX_BASE.Feature?this.layer.setZIndex(a):this.map.setLayerZIndex(this.layer,this.map.getLayerIndex(this.layer))},CLASS_NAME:"OpenLayers.Handler.Feature"});OpenLayers.Control.DragFeature=OpenLayers.Class(OpenLayers.Control,{geometryTypes:null,onStart:function(a,b){},onDrag:function(a,b){},onComplete:function(a,b){},onEnter:function(a){},onLeave:function(a){},documentDrag:!1,layer:null,feature:null,dragCallbacks:{},featureCallbacks:{},lastPixel:null,initialize:function(a,b){OpenLayers.Control.prototype.initialize.apply(this,[b]);this.layer=a;this.handlers={drag:new OpenLayers.Handler.Drag(this,OpenLayers.Util.extend({down:this.downFeature,move:this.moveFeature, +moveLayerBack:function(){var a=this.layer.getZIndex()-1;a>=this.map.Z_INDEX_BASE.Feature?this.layer.setZIndex(a):this.map.setLayerZIndex(this.layer,this.map.getLayerIndex(this.layer))},CLASS_NAME:"OpenLayers.Handler.Feature"}); +OpenLayers.Control.DragFeature=OpenLayers.Class(OpenLayers.Control,{geometryTypes:null,onStart:function(a,b){},onDrag:function(a,b){},onComplete:function(a,b){},onEnter:function(a){},onLeave:function(a){},documentDrag:!1,layer:null,feature:null,dragCallbacks:{},featureCallbacks:{},lastPixel:null,initialize:function(a,b){OpenLayers.Control.prototype.initialize.apply(this,[b]);this.layer=a;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(a){this.handlers.feature.touch&&!this.over&&this.overFeature(a)&&(this.handlers.drag.dragstart(this.handlers.feature.evt),this.handlers.drag.stopDown= !1)},clickoutFeature:function(a){this.handlers.feature.touch&&this.over&&(this.outFeature(a),this.handlers.drag.stopDown=!0)},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=!1;this.lastPixel=null;OpenLayers.Element.removeClass(this.map.viewPortDiv, this.displayClass+"Over");return OpenLayers.Control.prototype.deactivate.apply(this,arguments)},overFeature:function(a){var b=!1;this.handlers.drag.dragging?this.over=this.feature.id==a.id?!0:!1:(this.feature=a,this.handlers.drag.activate(),this.over=b=!0,OpenLayers.Element.addClass(this.map.viewPortDiv,this.displayClass+"Over"),this.onEnter(a));return b},downFeature:function(a){this.lastPixel=a;this.onStart(this.feature,a)},moveFeature:function(a){var b=this.map.getResolution();this.feature.geometry.move(b* (a.x-this.lastPixel.x),b*(this.lastPixel.y-a.y));this.layer.drawFeature(this.feature);this.lastPixel=a;this.onDrag(this.feature,a)},upFeature:function(a){this.over||this.handlers.drag.deactivate()},doneDragging:function(a){this.onComplete(this.feature,a)},outFeature:function(a){this.handlers.drag.dragging?this.feature.id==a.id&&(this.over=!1):(this.over=!1,this.handlers.drag.deactivate(),OpenLayers.Element.removeClass(this.map.viewPortDiv,this.displayClass+"Over"),this.onLeave(a),this.feature=null)}, -cancel:function(){this.handlers.drag.deactivate();this.over=!1},setMap:function(a){this.handlers.drag.setMap(a);this.handlers.feature.setMap(a);OpenLayers.Control.prototype.setMap.apply(this,arguments)},CLASS_NAME:"OpenLayers.Control.DragFeature"});OpenLayers.Handler.Box=OpenLayers.Class(OpenLayers.Handler,{dragHandler:null,boxDivClassName:"olHandlerBoxZoomBox",boxOffsets:null,initialize:function(a,b,c){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);this.dragHandler&&(this.dragHandler.destroy(),this.dragHandler= +cancel:function(){this.handlers.drag.deactivate();this.over=!1},setMap:function(a){this.handlers.drag.setMap(a);this.handlers.feature.setMap(a);OpenLayers.Control.prototype.setMap.apply(this,arguments)},CLASS_NAME:"OpenLayers.Control.DragFeature"}); +OpenLayers.Handler.Box=OpenLayers.Class(OpenLayers.Handler,{dragHandler:null,boxDivClassName:"olHandlerBoxZoomBox",boxOffsets:null,initialize:function(a,b,c){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);this.dragHandler&&(this.dragHandler.destroy(),this.dragHandler= null)},setMap:function(a){OpenLayers.Handler.prototype.setMap.apply(this,arguments);this.dragHandler&&this.dragHandler.setMap(a)},startBox:function(a){this.callback("start",[]);this.zoomBox=OpenLayers.Util.createDiv("zoomBox",{x:-9999,y:-9999});this.zoomBox.className=this.boxDivClassName;this.zoomBox.style.zIndex=this.map.Z_INDEX_BASE.Popup-1;this.map.viewPortDiv.appendChild(this.zoomBox);OpenLayers.Element.addClass(this.map.viewPortDiv,"olDrawBox")},moveBox:function(a){var b=this.dragHandler.start.x, -c=this.dragHandler.start.y,d=Math.abs(b-a.x),e=Math.abs(c-a.y),f=this.getBoxOffsets();this.zoomBox.style.width=d+f.width+1+"px";this.zoomBox.style.height=e+f.height+1+"px";this.zoomBox.style.left=(a.xb?this.callback("down",[a,this.cumulative?Math.max(-this.maxDelta, +f){c.map.pan(a,b,{dragging:!f,animate:!1})})}this.panned=!1}},CLASS_NAME:"OpenLayers.Control.DragPan"}); +OpenLayers.Handler.MouseWheel=OpenLayers.Class(OpenLayers.Handler,{wheelListener:null,interval:0,maxDelta:Number.POSITIVE_INFINITY,delta:0,cumulative:!0,initialize:function(a,b,c){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(a){if(this.map&&this.checkModifiers(a)){for(var b= +!1,c=!1,d=!1,e=OpenLayers.Event.element(a);null!=e&&!d&&!b;){if(!b)try{var f,b=(f=e.currentStyle?e.currentStyle.overflow:document.defaultView.getComputedStyle(e,null).getPropertyValue("overflow"))&&"auto"==f||"scroll"==f}catch(l){}if(!c&&(c=OpenLayers.Element.hasClass(e,"olScrollable"),!c))for(var d=0,g=this.map.layers.length;db?this.callback("down",[a,this.cumulative?Math.max(-this.maxDelta, b):-1]):this.callback("up",[a,this.cumulative?Math.min(this.maxDelta,b):1]))},activate:function(a){if(OpenLayers.Handler.prototype.activate.apply(this,arguments)){var b=this.wheelListener;OpenLayers.Event.observe(window,"DOMMouseScroll",b);OpenLayers.Event.observe(window,"mousewheel",b);OpenLayers.Event.observe(document,"mousewheel",b);return!0}return!1},deactivate:function(a){if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){var b=this.wheelListener;OpenLayers.Event.stopObserving(window, -"DOMMouseScroll",b);OpenLayers.Event.stopObserving(window,"mousewheel",b);OpenLayers.Event.stopObserving(document,"mousewheel",b);return!0}return!1},CLASS_NAME:"OpenLayers.Handler.MouseWheel"});OpenLayers.Handler.Click=OpenLayers.Class(OpenLayers.Handler,{delay:300,single:!0,"double":!1,pixelTolerance:0,dblclickTolerance:13,stopSingle:!1,stopDouble:!1,timerId:null,down:null,last:null,first:null,rightclickTimerId:null,touchstart:function(a){this.startTouch();this.down=this.getEventInfo(a);this.last=this.getEventInfo(a);return!0},touchmove:function(a){this.last=this.getEventInfo(a);return!0},touchend:function(a){this.down&&(a.xy=this.last.xy,a.lastTouches=this.last.touches,this.handleSingle(a), +"DOMMouseScroll",b);OpenLayers.Event.stopObserving(window,"mousewheel",b);OpenLayers.Event.stopObserving(document,"mousewheel",b);return!0}return!1},CLASS_NAME:"OpenLayers.Handler.MouseWheel"}); +OpenLayers.Handler.Click=OpenLayers.Class(OpenLayers.Handler,{delay:300,single:!0,"double":!1,pixelTolerance:0,dblclickTolerance:13,stopSingle:!1,stopDouble:!1,timerId:null,down:null,last:null,first:null,rightclickTimerId:null,touchstart:function(a){this.startTouch();this.down=this.getEventInfo(a);this.last=this.getEventInfo(a);return!0},touchmove:function(a){this.last=this.getEventInfo(a);return!0},touchend:function(a){this.down&&(a.xy=this.last.xy,a.lastTouches=this.last.touches,this.handleSingle(a), this.down=null);return!0},mousedown:function(a){this.down=this.getEventInfo(a);this.last=this.getEventInfo(a);return!0},mouseup:function(a){var b=!0;this.checkModifiers(a)&&this.control.handleRightClicks&&OpenLayers.Event.isRightClick(a)&&(b=this.rightclick(a));return b},rightclick:function(a){if(this.passesTolerance(a)){if(null!=this.rightclickTimerId)return this.clearTimer(),this.callback("dblrightclick",[a]),!this.stopDouble;a=this["double"]?OpenLayers.Util.extend({},a):this.callback("rightclick", [a]);a=OpenLayers.Function.bind(this.delayedRightCall,this,a);this.rightclickTimerId=window.setTimeout(a,this.delay)}return!this.stopSingle},delayedRightCall:function(a){this.rightclickTimerId=null;a&&this.callback("rightclick",[a])},click:function(a){this.last||(this.last=this.getEventInfo(a));this.handleSingle(a);return!this.stopSingle},dblclick:function(a){this.handleDouble(a);return!this.stopDouble},handleDouble:function(a){this.passesDblclickTolerance(a)&&(this["double"]&&this.callback("dblclick", [a]),this.clearTimer())},handleSingle:function(a){this.passesTolerance(a)&&(null!=this.timerId?(this.last.touches&&1===this.last.touches.length&&(this["double"]&&OpenLayers.Event.preventDefault(a),this.handleDouble(a)),this.last.touches&&2===this.last.touches.length||this.clearTimer()):(this.first=this.getEventInfo(a),a=this.single?OpenLayers.Util.extend({},a):null,this.queuePotentialClick(a)))},queuePotentialClick:function(a){this.timerId=window.setTimeout(OpenLayers.Function.bind(this.delayedCall, this,a),this.delay)},passesTolerance:function(a){var b=!0;if(null!=this.pixelTolerance&&this.down&&this.down.xy&&(b=this.pixelTolerance>=this.down.xy.distanceTo(a.xy))&&this.touch&&this.down.touches.length===this.last.touches.length){a=0;for(var c=this.down.touches.length;athis.pixelTolerance){b=!1;break}}return b},getTouchDistance:function(a,b){return Math.sqrt(Math.pow(a.clientX-b.clientX,2)+Math.pow(a.clientY-b.clientY, 2))},passesDblclickTolerance:function(a){a=!0;this.down&&this.first&&(a=this.down.xy.distanceTo(this.first.xy)<=this.dblclickTolerance);return a},clearTimer:function(){null!=this.timerId&&(window.clearTimeout(this.timerId),this.timerId=null);null!=this.rightclickTimerId&&(window.clearTimeout(this.rightclickTimerId),this.rightclickTimerId=null)},delayedCall:function(a){this.timerId=null;a&&this.callback("click",[a])},getEventInfo:function(a){var b;if(a.touches){var c=a.touches.length;b=Array(c);for(var d, -e=0;eh.length||(a=this.getLocalXY(a),e=a[0],g=a[1],isNaN(e)||isNaN(g)))){this.canvas.lineCap="round";this.canvas.lineJoin="round";this.hitDetection&&(this.hitContext.lineCap="round",this.hitContext.lineJoin="round");if(b.graphicName in this.cachedSymbolBounds)d=this.cachedSymbolBounds[b.graphicName];else{d=new OpenLayers.Bounds;for(a=0;ah.length||(a=this.getLocalXY(a),e=a[0],g=a[1],isNaN(e)||isNaN(g)))){this.canvas.lineCap="round";this.canvas.lineJoin="round";this.hitDetection&&(this.hitContext.lineCap="round",this.hitContext.lineJoin="round");if(b.graphicName in this.cachedSymbolBounds)d= +this.cachedSymbolBounds[b.graphicName];else{d=new OpenLayers.Bounds;for(a=0;a=-this.MAX_PIXEL&&a<=this.MAX_PIXEL&&b>=-this.MAX_PIXEL&&b<=this.MAX_PIXEL},setExtent:function(a,b){var c=OpenLayers.Renderer.Elements.prototype.setExtent.apply(this,arguments),d=this.getResolution(),e=-a.left/d,d=a.top/d;if(b)return this.left=e,this.top=d,this.rendererRoot.setAttributeNS(null, "viewBox","0 0 "+this.size.w+" "+this.size.h),this.translate(this.xOffset,0),!0;(e=this.translate(e-this.left+this.xOffset,d-this.top))||this.setExtent(a,!0);return c&&e},translate:function(a,b){if(this.inValidRange(a,b,!0)){var c="";if(a||b)c="translate("+a+","+b+")";this.root.setAttributeNS(null,"transform",c);this.translationParameters={x:a,y:b};return!0}return!1},setSize:function(a){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(a,b){var c=null;switch(a.CLASS_NAME){case "OpenLayers.Geometry.Point":c=b.externalGraphic?"image":this.isComplexSymbol(b.graphicName)?"svg":"circle";break;case "OpenLayers.Geometry.Rectangle":c="rect";break;case "OpenLayers.Geometry.LineString":c="polyline";break;case "OpenLayers.Geometry.LinearRing":c="polygon";break;case "OpenLayers.Geometry.Polygon":case "OpenLayers.Geometry.Curve":c="path"}return c},setStyle:function(a, b,c){b=b||a._style;c=c||a._options;var d=b.title||b.graphicTitle;if(d){a.setAttributeNS(null,"title",d);var e=a.getElementsByTagName("title");0k;)f.removeChild(f.lastChild);for(var l=0;ld)k=(c-g)/(h-f),h=0>h?-d:d,c=g+(h-f)*k;if(c<-e||c>e)k=(h-f)/(c-g),c=0>c?-e:e,h=f+(c-g)*k;return h+","+c},getShortString:function(a){var b=this.getResolution(),c=(a.x-this.featureDx)/b+this.left;a=this.top-a.y/b;return this.inValidRange(c, a)?c+","+a:!1},getPosition:function(a){return{x:parseFloat(a.getAttributeNS(null,"cx")),y:parseFloat(a.getAttributeNS(null,"cy"))}},importSymbol:function(a){this.defs||(this.defs=this.createDefs());var b=this.container.id+"-"+a,c=document.getElementById(b);if(null!=c)return c;var d=OpenLayers.Renderer.symbol[a];if(!d)throw Error(a+" is not a valid symbol name");a=this.nodeFactory(b,"symbol");var e=this.nodeFactory(null,"polygon");a.appendChild(e);for(var c=new OpenLayers.Bounds(Number.MAX_VALUE,Number.MAX_VALUE, 0,0),f=[],g,h,k=0;kthis.value;break;case OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO:b=a<=this.value;break;case OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO:b= -a>=this.value;break;case OpenLayers.Filter.Comparison.BETWEEN:b=a>=this.lowerBoundary&&a<=this.upperBoundary;break;case OpenLayers.Filter.Comparison.LIKE:b=RegExp(this.value,"gi").test(a);break;case OpenLayers.Filter.Comparison.IS_NULL:b=null===a}return b},value2regex:function(a,b,c){if("."==a)throw Error("'.' is an unsupported wildCard character for OpenLayers.Filter.Comparison");a=a?a:"*";b=b?b:".";this.value=this.value.replace(RegExp("\\"+(c?c:"!")+"(.|$)","g"),"\\$1");this.value=this.value.replace(RegExp("\\"+ -b,"g"),".");this.value=this.value.replace(RegExp("\\"+a,"g"),".*");this.value=this.value.replace(RegExp("\\\\.\\*","g"),"\\"+a);return this.value=this.value.replace(RegExp("\\\\\\.","g"),"\\"+b)},regex2value:function(){var a=this.value,a=a.replace(/!/g,"!!"),a=a.replace(/(\\)?\\\./g,function(a,c){return c?a:"!."}),a=a.replace(/(\\)?\\\*/g,function(a,c){return c?a:"!*"}),a=a.replace(/\\\\/g,"\\");return a=a.replace(/\.\*/g,"*")},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.Filter.Comparison.IS_NULL="NULL";OpenLayers.Format.QueryStringFilter=function(){function a(a){a=a.replace(/%/g,"\\%");a=a.replace(/\\\\\.(\*)?/g,function(a,b){return b?a:"\\\\_"});a=a.replace(/\\\\\.\*/g,"\\\\%");a=a.replace(/(\\)?\.(\*)?/g,function(a,b,c){return b||c?a:"_"});a=a.replace(/(\\)?\.\*/g,function(a,b){return b?a:"%"});a=a.replace(/\\\./g,".");return a=a.replace(/(\\)?\\\*/g,function(a,b){return b?a:"*"})}var b={};b[OpenLayers.Filter.Comparison.EQUAL_TO]="eq";b[OpenLayers.Filter.Comparison.NOT_EQUAL_TO]="ne";b[OpenLayers.Filter.Comparison.LESS_THAN]= +arguments);b||(b=a.target,b=b.parentNode&&b!=this.rendererRoot?b.parentNode._featureId:void 0);return b},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(a){OpenLayers.Event.preventDefault(a)}; +OpenLayers.Filter.Spatial=OpenLayers.Class(OpenLayers.Filter,{type:null,property:null,value:null,distance:null,distanceUnits:null,evaluate:function(a){var b=!1;switch(this.type){case OpenLayers.Filter.Spatial.BBOX:case OpenLayers.Filter.Spatial.INTERSECTS:if(a.geometry){var c=this.value;"OpenLayers.Bounds"==this.value.CLASS_NAME&&(c=this.value.toGeometry());a.geometry.intersects(c)&&(b=!0)}break;default:throw Error("evaluate is not implemented for this filter type.");}return b},clone:function(){var a= +OpenLayers.Util.applyDefaults({value:this.value&&this.value.clone&&this.value.clone()},this);return new OpenLayers.Filter.Spatial(a)},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.Filter.Comparison=OpenLayers.Class(OpenLayers.Filter,{type:null,property:null,value:null,matchCase:!0,lowerBoundary:null,upperBoundary:null,initialize:function(a){OpenLayers.Filter.prototype.initialize.apply(this,[a]);this.type===OpenLayers.Filter.Comparison.LIKE&&void 0===a.matchCase&&(this.matchCase=null)},evaluate:function(a){a instanceof OpenLayers.Feature.Vector&&(a=a.attributes);var b=!1;a=a[this.property];if(void 0===a)return!1;switch(this.type){case OpenLayers.Filter.Comparison.EQUAL_TO:b= +this.value;b=this.matchCase||"string"!=typeof a||"string"!=typeof b?a==b:a.toUpperCase()==b.toUpperCase();break;case OpenLayers.Filter.Comparison.NOT_EQUAL_TO:b=this.value;b=this.matchCase||"string"!=typeof a||"string"!=typeof b?a!=b:a.toUpperCase()!=b.toUpperCase();break;case OpenLayers.Filter.Comparison.LESS_THAN:b=athis.value;break;case OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO:b=a<=this.value;break;case OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO:b= +a>=this.value;break;case OpenLayers.Filter.Comparison.BETWEEN:b=a>=this.lowerBoundary&&a<=this.upperBoundary;break;case OpenLayers.Filter.Comparison.LIKE:b=(new RegExp(this.value,"gi")).test(a);break;case OpenLayers.Filter.Comparison.IS_NULL:b=null===a}return b},value2regex:function(a,b,c){if("."==a)throw Error("'.' is an unsupported wildCard character for OpenLayers.Filter.Comparison");a=a?a:"*";b=b?b:".";this.value=this.value.replace(new RegExp("\\"+(c?c:"!")+"(.|$)","g"),"\\$1");this.value=this.value.replace(new RegExp("\\"+ +b,"g"),".");this.value=this.value.replace(new RegExp("\\"+a,"g"),".*");this.value=this.value.replace(RegExp("\\\\.\\*","g"),"\\"+a);return this.value=this.value.replace(RegExp("\\\\\\.","g"),"\\"+b)},regex2value:function(){var a=this.value,a=a.replace(/!/g,"!!"),a=a.replace(/(\\)?\\\./g,function(a,c){return c?a:"!."}),a=a.replace(/(\\)?\\\*/g,function(a,c){return c?a:"!*"}),a=a.replace(/\\\\/g,"\\");return a=a.replace(/\.\*/g,"*")},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.Filter.Comparison.IS_NULL="NULL"; +OpenLayers.Format.QueryStringFilter=function(){function a(a){a=a.replace(/%/g,"\\%");a=a.replace(/\\\\\.(\*)?/g,function(a,b){return b?a:"\\\\_"});a=a.replace(/\\\\\.\*/g,"\\\\%");a=a.replace(/(\\)?\.(\*)?/g,function(a,b,c){return b||c?a:"_"});a=a.replace(/(\\)?\.\*/g,function(a,b){return b?a:"%"});a=a.replace(/\\\./g,".");return a=a.replace(/(\\)?\\\*/g,function(a,b){return b?a:"*"})}var b={};b[OpenLayers.Filter.Comparison.EQUAL_TO]="eq";b[OpenLayers.Filter.Comparison.NOT_EQUAL_TO]="ne";b[OpenLayers.Filter.Comparison.LESS_THAN]= "lt";b[OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO]="lte";b[OpenLayers.Filter.Comparison.GREATER_THAN]="gt";b[OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO]="gte";b[OpenLayers.Filter.Comparison.LIKE]="ilike";return OpenLayers.Class(OpenLayers.Format,{wildcarded:!1,srsInBBOX:!1,write:function(c,d){d=d||{};var e=c.CLASS_NAME,e=e.substring(e.lastIndexOf(".")+1);switch(e){case "Spatial":switch(c.type){case OpenLayers.Filter.Spatial.BBOX:d.bbox=c.value.toArray();this.srsInBBOX&&c.projection&& d.bbox.push(c.projection.getCode());break;case OpenLayers.Filter.Spatial.DWITHIN:d.tolerance=c.distance;case OpenLayers.Filter.Spatial.WITHIN:d.lon=c.value.x;d.lat=c.value.y;break;default:OpenLayers.Console.warn("Unknown spatial filter type "+c.type)}break;case "Comparison":e=b[c.type];if(void 0!==e){var f=c.value;c.type==OpenLayers.Filter.Comparison.LIKE&&(f=a(f),this.wildcarded&&(f="%"+f+"%"));d[c.property+"__"+e]=f;d.queryable=d.queryable||[];d.queryable.push(c.property)}else OpenLayers.Console.warn("Unknown comparison filter type "+ -c.type);break;case "Logical":if(c.type===OpenLayers.Filter.Logical.AND)for(e=0,f=c.filters.length;e${title}',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 a=[],b;if(this.map&&this.map.layers){for(var c=0,d=this.map.layers.length;cf;)d=c.selectedFeatures[f],a&&a.except==d?++f:this.unselect(d)},clickFeature:function(a){this.hover||(-1=this.maxDepth)return!1;var c=OpenLayers.Util.extend({},b);c.depth++;for(var d=0,e=a.length;d=this.resFactor||a<=1/this.resFactor);return a},calculateBounds:function(a){a||(a=this.getMapBounds());var b=a.getCenterLonLat(),c=a.getWidth()*this.ratio;a=a.getHeight()*this.ratio;this.bounds=new OpenLayers.Bounds(b.lon-c/2,b.lat-a/2,b.lon+c/2,b.lat+a/2)},triggerRead:function(a){!this.response||a&&!0===a.noAbort|| -(this.layer.protocol.abort(this.response),this.layer.events.triggerEvent("loadend"));var b={filter:this.createFilter()};this.layer.events.triggerEvent("loadstart",b);this.response=this.layer.protocol.read(OpenLayers.Util.applyDefaults({filter:b.filter,callback:this.merge,scope:this},a))},createFilter:function(){var a=new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.BBOX,value:this.bounds,projection:this.layer.projection});this.layer.filter&&(a=new OpenLayers.Filter.Logical({type:OpenLayers.Filter.Logical.AND, -filters:[this.layer.filter,a]}));return a},merge:function(a){this.layer.destroyFeatures();if(a.success()){var b=a.features;if(b&&0=this.resFactor||a<=1/this.resFactor);return a},calculateBounds:function(a){a||(a=this.getMapBounds());var b=a.getCenterLonLat(),c=a.getWidth()*this.ratio;a=a.getHeight()*this.ratio;this.bounds=new OpenLayers.Bounds(b.lon-c/2,b.lat-a/2,b.lon+c/2,b.lat+a/2)},triggerRead:function(a){!this.response|| +a&&!0===a.noAbort||(this.layer.protocol.abort(this.response),this.layer.events.triggerEvent("loadend"));var b={filter:this.createFilter()};this.layer.events.triggerEvent("loadstart",b);this.response=this.layer.protocol.read(OpenLayers.Util.applyDefaults({filter:b.filter,callback:this.merge,scope:this},a))},createFilter:function(){var a=new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.BBOX,value:this.bounds,projection:this.layer.projection});this.layer.filter&&(a=new OpenLayers.Filter.Logical({type:OpenLayers.Filter.Logical.AND, +filters:[this.layer.filter,a]}));return a},merge:function(a){this.layer.destroyFeatures();if(a.success()){var b=a.features;if(b&&0 Date: Tue, 17 May 2016 17:14:08 +0100 Subject: Increase pixel tolerance of map click handler. --- web/js/map-OpenLayers.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index f6c446f7b..267643898 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -665,7 +665,7 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { defaultHandlerOptions: { 'single': true, 'double': false, - 'pixelTolerance': 0, + 'pixelTolerance': 4, 'stopSingle': false, 'stopDouble': false }, -- cgit v1.2.3 From fbae634bbb5e8caeeeb02fa296f3c68f955fe3d5 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Tue, 17 May 2016 11:28:07 +0100 Subject: Fix removal of cached update photos. It was possible that rotating an update photo did not remove its cached copy. --- perllib/FixMyStreet/App/Controller/Admin.pm | 4 ++-- perllib/FixMyStreet/App/Model/PhotoSet.pm | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm index 3e757f227..db9545830 100644 --- a/perllib/FixMyStreet/App/Controller/Admin.pm +++ b/perllib/FixMyStreet/App/Controller/Admin.pm @@ -784,7 +784,7 @@ sub report_edit : Path('report_edit') : Args(1) { } if ( $remove_photo_param || $new_state eq 'hidden' ) { - unlink glob FixMyStreet->path_to( 'web', 'photo', $problem->id . '.*' ); + $problem->get_photoset->delete_cached; } if ( $problem->is_visible() and $old_state eq 'unconfirmed' ) { @@ -1005,7 +1005,7 @@ sub update_edit : Path('update_edit') : Args(1) { } if ( $remove_photo_param || $new_state eq 'hidden' ) { - unlink glob FixMyStreet->path_to( 'web', 'photo', 'c', $update->id . '.*' ); + $update->get_photoset->delete_cached; } $update->name( $c->get_param('name') || '' ); diff --git a/perllib/FixMyStreet/App/Model/PhotoSet.pm b/perllib/FixMyStreet/App/Model/PhotoSet.pm index b44bf4b38..030dbd5be 100644 --- a/perllib/FixMyStreet/App/Model/PhotoSet.pm +++ b/perllib/FixMyStreet/App/Model/PhotoSet.pm @@ -255,9 +255,11 @@ sub delete_cached { my ($self) = @_; my $object = $self->object or return; + my @dirs = ('web', 'photo'); + push @dirs, 'c' if ref $object eq 'FixMyStreet::DB::Result::Comment'; + unlink glob FixMyStreet->path_to( - 'web', - 'photo', + @dirs, $object->id . '.*' ); } -- cgit v1.2.3 From 36790b4c14248f374e333dec805509e0b4d45ff4 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Wed, 18 May 2016 10:03:05 +0100 Subject: Don't allow photo IDs to be prepended with 0s. --- perllib/FixMyStreet/App/Controller/Photo.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perllib/FixMyStreet/App/Controller/Photo.pm b/perllib/FixMyStreet/App/Controller/Photo.pm index d24d3ff71..2734491fa 100644 --- a/perllib/FixMyStreet/App/Controller/Photo.pm +++ b/perllib/FixMyStreet/App/Controller/Photo.pm @@ -43,7 +43,7 @@ sub during :LocalRegex('^(temp|fulltemp)\.([0-9a-f]{40}\.(?:jpeg|png|gif|tiff))$ $c->forward( 'output', [ $photo ] ); } -sub index :LocalRegex('^(c/)?(\d+)(?:\.(\d+))?(?:\.(full|tn|fp))?\.(?:jpeg|png|gif|tiff)$') { +sub index :LocalRegex('^(c/)?([1-9]\d*)(?:\.(\d+))?(?:\.(full|tn|fp))?\.(?:jpeg|png|gif|tiff)$') { my ( $self, $c ) = @_; my ( $is_update, $id, $photo_number, $size ) = @{ $c->req->captures }; -- cgit v1.2.3 From f19221e0cd17d02159c01a6ddc2c55b28ce4d730 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Wed, 18 May 2016 11:17:53 +0100 Subject: Remove specific files rather than glob. This should improve performance when there are a lot of cached photos. --- perllib/FixMyStreet/App/Model/PhotoSet.pm | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/perllib/FixMyStreet/App/Model/PhotoSet.pm b/perllib/FixMyStreet/App/Model/PhotoSet.pm index 030dbd5be..1c8a86e3a 100644 --- a/perllib/FixMyStreet/App/Model/PhotoSet.pm +++ b/perllib/FixMyStreet/App/Model/PhotoSet.pm @@ -254,14 +254,25 @@ sub get_image_data { sub delete_cached { my ($self) = @_; my $object = $self->object or return; + my $id = $object->id or return; my @dirs = ('web', 'photo'); push @dirs, 'c' if ref $object eq 'FixMyStreet::DB::Result::Comment'; - unlink glob FixMyStreet->path_to( - @dirs, - $object->id . '.*' - ); + # Old files without an index number; will always be .jpeg + foreach my $size ("", ".fp", ".tn", ".full") { + unlink FixMyStreet->path_to(@dirs, "$id$size.jpeg"); + } + + # New files with index number + my @images = $self->all_ids; + foreach (map [ $_, $images[$_] ], 0 .. $#images) { + my ($i, $file) = @$_; + my ($fileid, $type) = split /\./, $file; + foreach my $size ("", ".fp", ".tn", ".full") { + unlink FixMyStreet->path_to(@dirs, "$id.$i$size.$type"); + } + } } sub remove_images { -- cgit v1.2.3 From 1a1bfff12415a7793fee22bcd4e5e39e10dbd4d3 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Fri, 22 Apr 2016 16:48:57 +0100 Subject: Fallback if request to Gaze fails. Fixes #1286. --- conf/general.yml-example | 2 +- perllib/FixMyStreet/App/Controller/Alert.pm | 7 ++----- perllib/FixMyStreet/App/Controller/Rss.pm | 10 +++++----- perllib/FixMyStreet/Gaze.pm | 24 ++++++++++++++++++++++++ perllib/FixMyStreet/Map.pm | 10 ++-------- perllib/FixMyStreet/Map/Google.pm | 4 ++-- perllib/FixMyStreet/Map/OSM.pm | 4 ++-- perllib/FixMyStreet/Script/Alerts.pm | 6 +++--- t/app/load_general_config.t | 5 ++--- t/fixmystreet.t | 6 +++--- 10 files changed, 46 insertions(+), 32 deletions(-) create mode 100644 perllib/FixMyStreet/Gaze.pm diff --git a/conf/general.yml-example b/conf/general.yml-example index 097d81b19..749b9e716 100644 --- a/conf/general.yml-example +++ b/conf/general.yml-example @@ -180,7 +180,7 @@ SMTP_PASSWORD: '' # Gaze is a world-wide service for population density lookups. You can leave # this as is. -GAZE_URL: 'http://gaze.mysociety.org/gaze' +GAZE_URL: 'https://gaze.mysociety.org/gaze' # Should problem reports link to the council summary pages? AREA_LINKS_FROM_PROBLEMS: '0' diff --git a/perllib/FixMyStreet/App/Controller/Alert.pm b/perllib/FixMyStreet/App/Controller/Alert.pm index 6972bbc04..ddda02abd 100644 --- a/perllib/FixMyStreet/App/Controller/Alert.pm +++ b/perllib/FixMyStreet/App/Controller/Alert.pm @@ -5,6 +5,7 @@ use namespace::autoclean; BEGIN { extends 'Catalyst::Controller'; } use mySociety::EmailUtil qw(is_valid_email); +use FixMyStreet::Gaze; =head1 NAME @@ -441,11 +442,7 @@ sub determine_location : Private { $c->go('index'); } - my $dist = - mySociety::Gaze::get_radius_containing_population( $c->stash->{latitude}, - $c->stash->{longitude}, 200000 ); - $dist = int( $dist * 10 + 0.5 ); - $dist = $dist / 10.0; + my $dist = FixMyStreet::Gaze::get_radius_containing_population($c->stash->{latitude}, $c->stash->{longitude}); $c->stash->{population_radius} = $dist; return 1; diff --git a/perllib/FixMyStreet/App/Controller/Rss.pm b/perllib/FixMyStreet/App/Controller/Rss.pm index 8d4f8313c..183b233a8 100755 --- a/perllib/FixMyStreet/App/Controller/Rss.pm +++ b/perllib/FixMyStreet/App/Controller/Rss.pm @@ -8,7 +8,7 @@ use XML::RSS; use FixMyStreet::App::Model::PhotoSet; -use mySociety::Gaze; +use FixMyStreet::Gaze; use mySociety::Locale; use mySociety::MaPit; use mySociety::Sundries qw(ordinal); @@ -143,10 +143,10 @@ sub local_problems_ll : Private { $c->stash->{qs} .= ";d=$d"; $d = 100 if $d > 100; } else { - $d = mySociety::Gaze::get_radius_containing_population( $lat, $lon, 200000 ); - $d = int( $d * 10 + 0.5 ) / 10; - mySociety::Locale::in_gb_locale { - $d = sprintf("%f", $d); + $d = FixMyStreet::Gaze::get_radius_containing_population($lat, $lon); + # Needs to be with a '.' for db passing + $d = mySociety::Locale::in_gb_locale { + sprintf("%f", $d); } } diff --git a/perllib/FixMyStreet/Gaze.pm b/perllib/FixMyStreet/Gaze.pm new file mode 100644 index 000000000..a072cd246 --- /dev/null +++ b/perllib/FixMyStreet/Gaze.pm @@ -0,0 +1,24 @@ +package FixMyStreet::Gaze; + +use strict; +use warnings; + +use mySociety::Gaze; + +sub get_radius_containing_population ($$) { + my ($lat, $lon) = @_; + + my $dist = eval { + mySociety::Locale::in_gb_locale { + mySociety::Gaze::get_radius_containing_population($lat, $lon, 200_000); + }; + }; + if ($@) { + # Error fetching from gaze, let's fall back to 10km + $dist = 10; + } + $dist = int( $dist * 10 + 0.5 ) / 10.0; + return $dist; +} + +1; diff --git a/perllib/FixMyStreet/Map.pm b/perllib/FixMyStreet/Map.pm index 81b81f656..6d641331f 100644 --- a/perllib/FixMyStreet/Map.pm +++ b/perllib/FixMyStreet/Map.pm @@ -16,7 +16,7 @@ use Module::Pluggable # Get the list of maps we want and load map classes at compile time my @ALL_MAP_CLASSES = allowed_maps(); -use mySociety::Gaze; +use FixMyStreet::Gaze; use mySociety::Locale; use Utils; @@ -105,13 +105,7 @@ sub _map_features { ? $c->cobrand->problems->around_map( @around_args, $around_limit, $category, $states ) : $around_map; - my $dist; - mySociety::Locale::in_gb_locale { - $dist = - mySociety::Gaze::get_radius_containing_population( $lat, $lon, - 200000 ); - }; - $dist = int( $dist * 10 + 0.5 ) / 10; + my $dist = FixMyStreet::Gaze::get_radius_containing_population( $lat, $lon ); my $limit = 20; my @ids = map { $_->id } @$around_map_list; diff --git a/perllib/FixMyStreet/Map/Google.pm b/perllib/FixMyStreet/Map/Google.pm index 46823f358..8ddf4f4e9 100644 --- a/perllib/FixMyStreet/Map/Google.pm +++ b/perllib/FixMyStreet/Map/Google.pm @@ -7,7 +7,7 @@ package FixMyStreet::Map::Google; use strict; -use mySociety::Gaze; +use FixMyStreet::Gaze; use Utils; use constant ZOOM_LEVELS => 6; @@ -30,7 +30,7 @@ sub display_map { # Adjust zoom level dependent upon population density my $dist = $c->stash->{distance} - || mySociety::Gaze::get_radius_containing_population( $params{latitude}, $params{longitude}, 200_000 ); + || FixMyStreet::Gaze::get_radius_containing_population( $params{latitude}, $params{longitude} ); my $default_zoom = $c->cobrand->default_map_zoom() ? $c->cobrand->default_map_zoom() : $numZoomLevels - 4; $default_zoom = $numZoomLevels - 3 if $dist < 10; diff --git a/perllib/FixMyStreet/Map/OSM.pm b/perllib/FixMyStreet/Map/OSM.pm index 7d91a9ee7..ae9e73a0a 100644 --- a/perllib/FixMyStreet/Map/OSM.pm +++ b/perllib/FixMyStreet/Map/OSM.pm @@ -8,7 +8,7 @@ package FixMyStreet::Map::OSM; use strict; use Math::Trig; -use mySociety::Gaze; +use FixMyStreet::Gaze; use Utils; use constant ZOOM_LEVELS => 6; @@ -59,7 +59,7 @@ sub display_map { # Adjust zoom level dependent upon population density my $dist = $c->stash->{distance} - || mySociety::Gaze::get_radius_containing_population( $params{latitude}, $params{longitude}, 200_000 ); + || FixMyStreet::Gaze::get_radius_containing_population( $params{latitude}, $params{longitude} ); my $default_zoom = $c->cobrand->default_map_zoom() ? $c->cobrand->default_map_zoom() : $numZoomLevels - 4; $default_zoom = $numZoomLevels - 3 if $dist < 10; diff --git a/perllib/FixMyStreet/Script/Alerts.pm b/perllib/FixMyStreet/Script/Alerts.pm index e799a5446..fc5fef953 100644 --- a/perllib/FixMyStreet/Script/Alerts.pm +++ b/perllib/FixMyStreet/Script/Alerts.pm @@ -7,7 +7,7 @@ use DateTime::Format::Pg; use IO::String; use mySociety::DBHandle qw(dbh); -use mySociety::Gaze; +use FixMyStreet::Gaze; use mySociety::Locale; use mySociety::MaPit; use RABX; @@ -175,10 +175,10 @@ sub send() { my $longitude = $alert->parameter; my $latitude = $alert->parameter2; - my $d = mySociety::Gaze::get_radius_containing_population($latitude, $longitude, 200000); + my $d = FixMyStreet::Gaze::get_radius_containing_population($latitude, $longitude); # Convert integer to GB locale string (with a ".") $d = mySociety::Locale::in_gb_locale { - sprintf("%f", int($d*10+0.5)/10); + sprintf("%f", $d); }; my $states = "'" . join( "', '", FixMyStreet::DB::Result::Problem::visible_states() ) . "'"; my %data = ( diff --git a/t/app/load_general_config.t b/t/app/load_general_config.t index 1051aac3f..16ca2fc54 100644 --- a/t/app/load_general_config.t +++ b/t/app/load_general_config.t @@ -5,7 +5,6 @@ use Test::More tests => 2; use_ok 'FixMyStreet::App'; -# GAZE_URL chosen as it is unlikely to change -is FixMyStreet::App->config->{GAZE_URL}, # - 'http://gaze.mysociety.org/gaze', # +is FixMyStreet::App->config->{GAZE_URL}, + 'https://gaze.mysociety.org/gaze', "check that known config param is loaded"; diff --git a/t/fixmystreet.t b/t/fixmystreet.t index d7f00b047..a601c10d5 100644 --- a/t/fixmystreet.t +++ b/t/fixmystreet.t @@ -18,17 +18,17 @@ is "$path_to_path", $file_path, "got $file_path"; # check that the config gets loaded and is immutable my $config = FixMyStreet->config; isa_ok $config, 'HASH'; -is $config->{GAZE_URL}, 'http://gaze.mysociety.org/gaze', +is $config->{GAZE_URL}, 'https://gaze.mysociety.org/gaze', "got GAZE_URL correctly"; throws_ok( sub { $config->{GAZE_URL} = 'some other value'; }, qr/Modification of a read-only value attempted/, 'attempt to change config caught' ); -is $config->{GAZE_URL}, 'http://gaze.mysociety.org/gaze', "GAZE_URL unchanged"; +is $config->{GAZE_URL}, 'https://gaze.mysociety.org/gaze', "GAZE_URL unchanged"; # check that we can get the value by key as well -is FixMyStreet->config('GAZE_URL'), 'http://gaze.mysociety.org/gaze', +is FixMyStreet->config('GAZE_URL'), 'https://gaze.mysociety.org/gaze', "GAZE_URL correct when got by key"; is FixMyStreet->config('BAD_KEY_DOES_NOT_EXIST'), undef, "config miss is undef"; -- cgit v1.2.3 From d4a75fd58381f2964607a2937946202e34cb6f30 Mon Sep 17 00:00:00 2001 From: Zarino Zappia Date: Thu, 21 Apr 2016 13:39:44 +0100 Subject: Improve in-place moderation UI This rearranges the moderation UI into logical chunks, and improves the 'revert to original' checkboxes by: - hiding them unless there's some original text to revert to - displaying the text that will be reverted to in the appropriate input fields when checked. Part of mysociety/FixMyStreet-Commercial#731 --- perllib/FixMyStreet/App/Controller/Report.pm | 11 +++ templates/web/base/report/_main.html | 115 +++++++++++++------------ templates/web/oxfordshire/report/_main.html | 123 ++++++++++++++------------- web/cobrands/sass/_base.scss | 12 +++ web/js/moderate.js | 13 ++- 5 files changed, 156 insertions(+), 118 deletions(-) diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm index 475a29fb5..b3e546c2c 100644 --- a/perllib/FixMyStreet/App/Controller/Report.pm +++ b/perllib/FixMyStreet/App/Controller/Report.pm @@ -130,6 +130,17 @@ sub load_problem_or_display_error : Private { } $c->stash->{problem} = $problem; + if ( $c->user_exists && $c->user->has_permission_to(moderate => $problem->bodies_str) ) { + $c->stash->{problem_original} = $problem->find_or_new_related( + moderation_original_data => { + title => $problem->title, + detail => $problem->detail, + photo => $problem->photo, + anonymous => $problem->anonymous, + } + ); + } + return 1; } diff --git a/templates/web/base/report/_main.html b/templates/web/base/report/_main.html index 7260e619a..efff314f8 100644 --- a/templates/web/base/report/_main.html +++ b/templates/web/base/report/_main.html @@ -1,61 +1,40 @@ [% moderating = c.user && c.user.has_permission_to('moderate', problem.bodies_str) %] -[% IF moderating %] -[%# TODO: extract stylesheet! %] - -[% END %] -
+ [% IF moderating %] - [% original = problem.moderation_original_data %] + [% original = problem_original %]
- -
- - -
- - - [% IF problem.photo or original.photo %] -
- - - [% END %] -
+

+ +

[% END %] +

[% problem.title | html %]

- [% IF moderating %] + + [% IF moderating %]
- [% IF problem.title != original.title %] - - - [% END %] -

+ [% IF problem.title != original.title %] + + [% END %] +

- [% END %] + [% END %] +
+ +

[% problem.meta_line(c) | html %] [%- IF !problem.used_map %]; ([% loc('there is no pin shown as the user did not use the map') %])[% END %]

+ [% IF problem.bodies_str %] [% INCLUDE 'report/_council_sent_info.html' %] [% ELSE %] @@ -67,26 +46,50 @@ [% INCLUDE 'report/_support.html' %] + [% IF moderating %] + [% IF problem.photo or original.photo %] +

+ +

+ [% END %] + [% END %] + [% INCLUDE 'report/photo.html' object=problem %]
[% add_links( problem.detail ) | html_para %]
- [% IF moderating %] -
- [% IF problem.detail != original.detail %] - - - [% END %] - -
+ [% IF moderating %] +

+ [% IF problem.detail != original.detail %] + + [% END %] + +

-
+
+

+ +

+

- - -

+

+

+ + +

+
+
[% END %]
diff --git a/templates/web/oxfordshire/report/_main.html b/templates/web/oxfordshire/report/_main.html index a4cb3e20b..2ff193075 100644 --- a/templates/web/oxfordshire/report/_main.html +++ b/templates/web/oxfordshire/report/_main.html @@ -1,61 +1,40 @@ [% moderating = c.user && c.user.has_permission_to('moderate', problem.bodies_str) %] -[% IF moderating %] -[%# TODO: extract stylesheet! %] - -[% END %] -
+ [% IF moderating %] - [% original = problem.moderation_original_data %] + [% original = problem_original %]
- -
- - -
- - - [% IF problem.photo or original.photo %] -
- - - [% END %] -
+

+ +

[% END %] +

[% problem.title | html %]

- [% IF moderating %] + + [% IF moderating %]
- [% IF problem.title != original.title %] - - - [% END %] -

+ [% IF problem.title != original.title %] + + [% END %] +

- [% END %] + [% END %] +
+ +

[% problem.meta_line(c) | html %] [%- IF !problem.used_map %]; ([% loc('there is no pin shown as the user did not use the map') %])[% END %]

+ [% IF problem.whensent %]

[% problem.duration_string(c) %]

[% END %] @@ -65,34 +44,58 @@ [% INCLUDE 'report/_support.html' %] + [% IF moderating %] + [% IF problem.photo or original.photo %] +

+ +

+ [% END %] + [% END %] + [% INCLUDE 'report/photo.html' object=problem %]
[% add_links( problem.detail ) | html_para %]
- [% IF moderating %] -
- [% IF problem.detail != original.detail %] - - - [% END %] - -
+ [% IF moderating %] +

+ [% IF problem.detail != original.detail %] + + [% END %] + +

-
+
+

+ +

+

- - -

+

+

+ + +

+
+
[% END %] [% IF problem.bodies_str %] - [% INCLUDE 'report/_council_sent_info.html' %] + [% INCLUDE 'report/_council_sent_info.html' %] [% ELSE %] -
-

[% loc('Not reported to council') %]

-
+
+

[% loc('Not reported to council') %]

+
[% END %]
diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss index 6af6d88ff..a8f6e7a96 100644 --- a/web/cobrands/sass/_base.scss +++ b/web/cobrands/sass/_base.scss @@ -1048,6 +1048,18 @@ input.final-submit { } } +.moderate-edit { + display: none; // gets shown by javascript + + :disabled { + background: #ddd; + } + + h1 input { + border-width: (0.125em/2); // compensate for 2em font-size on h1s + } +} + // map stuff #map_box{ @extend .full-width; diff --git a/web/js/moderate.js b/web/js/moderate.js index 0be3cca8d..53277d9d9 100644 --- a/web/js/moderate.js +++ b/web/js/moderate.js @@ -1,3 +1,11 @@ +function toggle_original ($input, revert) { + $input.prop('disabled', revert); + if (revert) { + $input.data('currentValue', $input.val()); + } + $input.val($input.data(revert ? 'originalValue' : 'currentValue')); +} + function setup_moderation (elem, word) { elem.each( function () { @@ -8,10 +16,11 @@ function setup_moderation (elem, word) { }); $elem.find('.revert-title').change( function () { - $elem.find('input[name=problem_title]').prop('disabled', $(this).prop('checked')); + toggle_original($elem.find('input[name=problem_title]'), $(this).prop('checked')); }); + $elem.find('.revert-textarea').change( function () { - $elem.find('textarea').prop('disabled', $(this).prop('checked')); + toggle_original($elem.find('textarea'), $(this).prop('checked')); }); var hide_document = $elem.find('.hide-document'); -- cgit v1.2.3 From e039a7e191d1f352b5d24bf5f965f2efeb5dc3de Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Fri, 20 May 2016 14:33:37 +0100 Subject: Add search boxes to admin index page, move stats. Move most index page statistics to their own pages. --- perllib/FixMyStreet/App/Controller/Admin.pm | 67 +++++++++++++++++----------- perllib/FixMyStreet/App/Controller/Status.pm | 2 +- templates/web/base/admin/index.html | 57 +++++++++++------------ templates/web/base/admin/stats.html | 7 +++ templates/web/base/admin/stats_by_state.html | 24 ++++++++++ templates/web/base/admin/stats_fix_rate.html | 10 +++++ templates/web/base/status/stats.html | 2 +- 7 files changed, 108 insertions(+), 61 deletions(-) create mode 100644 templates/web/base/admin/stats_by_state.html create mode 100644 templates/web/base/admin/stats_fix_rate.html diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm index db9545830..4e288556f 100644 --- a/perllib/FixMyStreet/App/Controller/Admin.pm +++ b/perllib/FixMyStreet/App/Controller/Admin.pm @@ -71,25 +71,7 @@ sub index : Path : Args(0) { return $c->cobrand->admin(); } - my $problems = $c->cobrand->problems->summary_count; - - my %prob_counts = - map { $_->state => $_->get_column('state_count') } $problems->all; - - %prob_counts = - map { $_ => $prob_counts{$_} || 0 } - ( FixMyStreet::DB::Result::Problem->all_states() ); - $c->stash->{problems} = \%prob_counts; - $c->stash->{total_problems_live} += $prob_counts{$_} ? $prob_counts{$_} : 0 - for ( FixMyStreet::DB::Result::Problem->visible_states() ); - $c->stash->{total_problems_users} = $c->cobrand->problems->unique_users; - - my $comments = $c->cobrand->updates->summary_count; - - my %comment_counts = - map { $_->state => $_->get_column('state_count') } $comments->all; - - $c->stash->{comments} = \%comment_counts; + $c->forward('stats_by_state'); my $alerts = $c->model('DB::Alert')->summary_report_alerts( $c->cobrand->restriction ); @@ -129,11 +111,7 @@ sub index : Path : Args(0) { : _('n/a'); $c->stash->{questionnaires} = \%questionnaire_counts; - if ($c->get_param('show_categories')) { - $c->stash->{categories} = $c->cobrand->problems->categories_summary(); - } - - $c->stash->{total_bodies} = $c->model('DB::Body')->count(); + $c->forward('fetch_all_bodies'); return 1; } @@ -196,7 +174,7 @@ sub timeline : Path( 'timeline' ) : Args(0) { return 1; } -sub questionnaire : Path('questionnaire') : Args(0) { +sub questionnaire : Path('stats/questionnaire') : Args(0) { my ( $self, $c ) = @_; my $questionnaires = $c->model('DB::Questionnaire')->search( @@ -232,6 +210,11 @@ sub questionnaire : Path('questionnaire') : Args(0) { sub bodies : Path('bodies') : Args(0) { my ( $self, $c ) = @_; + if (my $body_id = $c->get_param('body')) { + $c->res->redirect( $c->uri_for( 'body', $body_id ) ); + return; + } + $c->forward( 'get_token' ); my $edit_activity = $c->model('DB::ContactsHistory')->search( @@ -1187,6 +1170,36 @@ sub flagged : Path('flagged') : Args(0) { return 1; } +sub stats_by_state : Path('stats/state') : Args(0) { + my ( $self, $c ) = @_; + + my $problems = $c->cobrand->problems->summary_count; + + my %prob_counts = + map { $_->state => $_->get_column('state_count') } $problems->all; + + %prob_counts = + map { $_ => $prob_counts{$_} || 0 } + ( FixMyStreet::DB::Result::Problem->all_states() ); + $c->stash->{problems} = \%prob_counts; + $c->stash->{total_problems_live} += $prob_counts{$_} ? $prob_counts{$_} : 0 + for ( FixMyStreet::DB::Result::Problem->visible_states() ); + $c->stash->{total_problems_users} = $c->cobrand->problems->unique_users; + + my $comments = $c->cobrand->updates->summary_count; + + my %comment_counts = + map { $_->state => $_->get_column('state_count') } $comments->all; + + $c->stash->{comments} = \%comment_counts; +} + +sub stats_fix_rate : Path('stats/fix-rate') : Args(0) { + my ( $self, $c ) = @_; + + $c->stash->{categories} = $c->cobrand->problems->categories_summary(); +} + sub stats : Path('stats') : Args(0) { my ( $self, $c ) = @_; @@ -1285,7 +1298,6 @@ sub set_allowed_pages : Private { 'bodies' => [_('Bodies'), 1], 'reports' => [_('Reports'), 2], 'timeline' => [_('Timeline'), 3], - 'questionnaire' => [_('Survey'), 4], 'users' => [_('Users'), 5], 'flagged' => [_('Flagged'), 6], 'stats' => [_('Stats'), 7], @@ -1552,7 +1564,8 @@ sub check_page_allowed : Private { $c->forward('set_allowed_pages'); - (my $page = $c->req->action) =~ s#admin/?##; + (my $page = $c->req->path) =~ s#admin/?##; + $page =~ s#/.*##; $page ||= 'summary'; diff --git a/perllib/FixMyStreet/App/Controller/Status.pm b/perllib/FixMyStreet/App/Controller/Status.pm index 931c7bd47..57c8f362e 100755 --- a/perllib/FixMyStreet/App/Controller/Status.pm +++ b/perllib/FixMyStreet/App/Controller/Status.pm @@ -58,7 +58,7 @@ sub index : Path : Args(0) { alerts_unconfirmed => $c->stash->{alerts}{0}, questionnaires_sent => $c->stash->{questionnaires}{total}, questionnaires_answered => $c->stash->{questionnaires}{1}, - bodies => $c->stash->{total_bodies}, + bodies => scalar @{$c->stash->{bodies}}, contacts => $c->stash->{contacts}{total}, }; my $body = JSON->new->utf8(1)->pretty->encode($data); diff --git a/templates/web/base/admin/index.html b/templates/web/base/admin/index.html index 4c4a7b388..66d986aaf 100644 --- a/templates/web/base/admin/index.html +++ b/templates/web/base/admin/index.html @@ -12,7 +12,7 @@ or get in touch to let us know about your use of the FixMyStreet Platform, and to receive notices of updates.
-[% IF total_bodies == 0 %] +[% IF bodies.size == 0 %]

[% loc('Currently no bodies have been created.') %]
@@ -20,14 +20,31 @@ and to receive notices of updates.

[% END %] -[%- BLOCK states -%] -[%- FOREACH state IN list %] -[%- '" IF loop.last %] -[%- END %] -[% END -%] +
+

+ +

+ +
+

+ +

+ +
+ + + +
+

[% loc('Stats') %]

[% INCLUDE 'status/stats.html' admin_include_users=1 %] [% IF c.cobrand.admin_show_creation_graph -%] @@ -36,28 +53,4 @@ and to receive notices of updates.

[% END -%] -

[% loc('Problem breakdown by state') %]

-[% FOREACH group IN state_groups %] -[%- '" IF loop.last %] -[%- END %] - -

[% loc('Update breakdown by state') %]

-[% PROCESS states object=comments list=comments.keys.sort %] - -[% IF categories.size %] -

[% loc('Category fix rate for problems > 4 weeks old') %]

- - -[% FOREACH category IN categories %] - -[% END %] -
[% loc('Category') %][% loc('Total') %][% loc('Fixed') %]
[% category.key %][% category.value.total %][% category.value.fixed / category.value.total * 100 | format('%.1f') %]%
-[% ELSE %] -

[% loc('Category fix rate for problems > 4 weeks old') %]

-[% END %] - [% INCLUDE 'admin/footer.html' %] diff --git a/templates/web/base/admin/stats.html b/templates/web/base/admin/stats.html index d143d9f28..5aaf59068 100644 --- a/templates/web/base/admin/stats.html +++ b/templates/web/base/admin/stats.html @@ -51,6 +51,13 @@ [% loc( 'Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little' ) %]

[% END %] +[% ELSE %] + + [% END %] [% IF errors %] diff --git a/templates/web/base/admin/stats_by_state.html b/templates/web/base/admin/stats_by_state.html new file mode 100644 index 000000000..b003d934e --- /dev/null +++ b/templates/web/base/admin/stats_by_state.html @@ -0,0 +1,24 @@ +[% INCLUDE 'admin/header.html' title=loc('Stats') -%] +[% PROCESS 'admin/report_blocks.html' %] + +[%- BLOCK states -%] +[%- FOREACH state IN list %] +[%- '" IF loop.last %] +[%- END %] +[% END -%] + +

[% loc('Problem breakdown by state') %]

+[% FOREACH group IN state_groups %] +[%- '" IF loop.last %] +[%- END %] + +

[% loc('Update breakdown by state') %]

+[% PROCESS states object=comments list=comments.keys.sort %] + +[% INCLUDE 'admin/footer.html' %] diff --git a/templates/web/base/admin/stats_fix_rate.html b/templates/web/base/admin/stats_fix_rate.html new file mode 100644 index 000000000..fb88a1c06 --- /dev/null +++ b/templates/web/base/admin/stats_fix_rate.html @@ -0,0 +1,10 @@ +[% INCLUDE 'admin/header.html' title=loc('Category fix rate for problems > 4 weeks old') -%] + + + +[% FOREACH category IN categories %] + +[% END %] +
[% loc('Category') %][% loc('Total') %][% loc('Fixed') %]
[% category.key %][% category.value.total %][% category.value.fixed / category.value.total * 100 | format('%.1f') %]%
+ +[% INCLUDE 'admin/footer.html' %] diff --git a/templates/web/base/status/stats.html b/templates/web/base/status/stats.html index f847db2ef..0f201920d 100644 --- a/templates/web/base/status/stats.html +++ b/templates/web/base/status/stats.html @@ -8,7 +8,7 @@ alerts_0 = alerts.0 | format_number; questionnaires_total = questionnaires.total | format_number; questionnaires_1 = questionnaires.1 | format_number; - total_bodies = total_bodies | format_number; + total_bodies = bodies.size | format_number; contacts_total = contacts.total | format_number; contacts_1 = contacts.1 | format_number; contacts_0 = contacts.0 | format_number; -- cgit v1.2.3 From cc5613a4108615d7b066b9974038c04b4afbd9e2 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Tue, 24 May 2016 16:52:30 +0100 Subject: Move processed_summary_string function to template Fixes #694. --- perllib/FixMyStreet/DB/Result/Problem.pm | 30 ----------------------- templates/web/base/report/_council_sent_info.html | 14 ++++++++++- 2 files changed, 13 insertions(+), 31 deletions(-) diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm index 12dad073e..5b853134e 100644 --- a/perllib/FixMyStreet/DB/Result/Problem.pm +++ b/perllib/FixMyStreet/DB/Result/Problem.pm @@ -662,36 +662,6 @@ sub can_display_external_id { return 0; } -# TODO Some/much of this could be moved to the template - -# either: -# "sent to council 3 mins later" -# "[Council name] ref: XYZ" -# or -# "sent to council 3 mins later, their ref: XYZ" -# -# Note: some silliness with pronouns and the adjacent comma mean this is -# being presented as a single string rather than two -sub processed_summary_string { - my ( $problem, $c ) = @_; - my ($duration_clause, $external_ref_clause); - if ($problem->whensent) { - $duration_clause = $problem->duration_string($c); - } - if ($problem->can_display_external_id) { - if ($duration_clause) { - $external_ref_clause = '' . sprintf(_('Council ref: %s'), $problem->external_id) . '.'; - } else { - $external_ref_clause = '' . sprintf(_('%s ref: %s'), $problem->external_body, $problem->external_id) . '.'; - } - } - if ($duration_clause and $external_ref_clause) { - return "$duration_clause. $external_ref_clause" - } else { - return $duration_clause || $external_ref_clause - } -} - sub duration_string { my ( $problem, $c ) = @_; my $body = $problem->body( $c ); diff --git a/templates/web/base/report/_council_sent_info.html b/templates/web/base/report/_council_sent_info.html index 4496611e0..affc73414 100644 --- a/templates/web/base/report/_council_sent_info.html +++ b/templates/web/base/report/_council_sent_info.html @@ -1,5 +1,17 @@ [% IF problem.whensent || problem.can_display_external_id %]

- [% problem.processed_summary_string(c) %] + [% SET duration_clause = problem.duration_string(c) IF problem.whensent %] + [%- IF problem.can_display_external_id %] + [%- IF duration_clause %] + [%- external_ref_clause = tprintf(loc('Council ref: %s'), problem.external_id) %] + [%- ELSE %] + [%- external_ref_clause = tprintf(loc('%s ref: %s'), problem.external_body, problem.external_id) %] + [%- END %] + [%- END -%] + [% duration_clause %] + [%- IF external_ref_clause %] + [%- IF duration_clause %]. [% END %] + [% external_ref_clause %]. + [%- END %]

[% END %] -- cgit v1.2.3 From 872545f8a71a98a91951be04515ca491e3cfed1d Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Tue, 24 May 2016 16:54:31 +0100 Subject: Add a couple of template hooks to report/_main This removes the need for the Oxfordshire cobrand to override. --- templates/web/base/report/_main.html | 8 +- templates/web/base/report/_main_sent_info.html | 5 + templates/web/oxfordshire/report/_main.html | 101 --------------------- templates/web/oxfordshire/report/_main_after.html | 7 ++ .../web/oxfordshire/report/_main_sent_info.html | 3 + 5 files changed, 18 insertions(+), 106 deletions(-) create mode 100644 templates/web/base/report/_main_sent_info.html delete mode 100644 templates/web/oxfordshire/report/_main.html create mode 100644 templates/web/oxfordshire/report/_main_after.html create mode 100644 templates/web/oxfordshire/report/_main_sent_info.html diff --git a/templates/web/base/report/_main.html b/templates/web/base/report/_main.html index efff314f8..c079b9ebd 100644 --- a/templates/web/base/report/_main.html +++ b/templates/web/base/report/_main.html @@ -35,11 +35,7 @@ [%- IF !problem.used_map %]; ([% loc('there is no pin shown as the user did not use the map') %])[% END %]

- [% IF problem.bodies_str %] - [% INCLUDE 'report/_council_sent_info.html' %] - [% ELSE %] -

[% loc('Not reported to council') %]

- [% END %] + [% INCLUDE 'report/_main_sent_info.html' %] [% mlog = problem.latest_moderation_log_entry(); IF mlog %]

Moderated by [% mlog.user.from_body.name %] at [% prettify_dt(mlog.whenedited) %]

[% END %] @@ -92,4 +88,6 @@ [% END %] + + [% TRY %][% PROCESS 'report/_main_after.html' %][% CATCH file %][% END %] diff --git a/templates/web/base/report/_main_sent_info.html b/templates/web/base/report/_main_sent_info.html new file mode 100644 index 000000000..3e54ac8ed --- /dev/null +++ b/templates/web/base/report/_main_sent_info.html @@ -0,0 +1,5 @@ +[% IF problem.bodies_str %] + [% INCLUDE 'report/_council_sent_info.html' %] +[% ELSE %] +

[% loc('Not reported to council') %]

+[% END %] diff --git a/templates/web/oxfordshire/report/_main.html b/templates/web/oxfordshire/report/_main.html deleted file mode 100644 index 2ff193075..000000000 --- a/templates/web/oxfordshire/report/_main.html +++ /dev/null @@ -1,101 +0,0 @@ -[% moderating = c.user && c.user.has_permission_to('moderate', problem.bodies_str) %] - -
- - [% IF moderating %] - [% original = problem_original %] -
-

- -

- [% END %] - -

[% problem.title | html %]

- - [% IF moderating %] -
- [% IF problem.title != original.title %] - - [% END %] -

-
- [% END %] - -
- -
-

- [% problem.meta_line(c) | html %] - [%- IF !problem.used_map %]; ([% loc('there is no pin shown as the user did not use the map') %])[% END %] -

- - [% IF problem.whensent %] -

[% problem.duration_string(c) %]

- [% END %] - [% mlog = problem.latest_moderation_log_entry(); IF mlog %] -

Moderated by [% mlog.user.from_body.name %] at [% prettify_dt(mlog.whenedited) %]

- [% END %] - - [% INCLUDE 'report/_support.html' %] - - [% IF moderating %] - [% IF problem.photo or original.photo %] -

- -

- [% END %] - [% END %] - - [% INCLUDE 'report/photo.html' object=problem %] -
- [% add_links( problem.detail ) | html_para %] -
- - [% IF moderating %] -

- [% IF problem.detail != original.detail %] - - [% END %] - -

- -
-

- -

-

- - -

-

- - -

-
- -
- [% END %] - - [% IF problem.bodies_str %] - [% INCLUDE 'report/_council_sent_info.html' %] - [% ELSE %] -
-

[% loc('Not reported to council') %]

-
- [% END %] -
diff --git a/templates/web/oxfordshire/report/_main_after.html b/templates/web/oxfordshire/report/_main_after.html new file mode 100644 index 000000000..16491a556 --- /dev/null +++ b/templates/web/oxfordshire/report/_main_after.html @@ -0,0 +1,7 @@ +[% IF problem.bodies_str %] + [% INCLUDE 'report/_council_sent_info.html' %] +[% ELSE %] +
+

[% loc('Not reported to council') %]

+
+[% END %] diff --git a/templates/web/oxfordshire/report/_main_sent_info.html b/templates/web/oxfordshire/report/_main_sent_info.html new file mode 100644 index 000000000..c955a5fae --- /dev/null +++ b/templates/web/oxfordshire/report/_main_sent_info.html @@ -0,0 +1,3 @@ +[% IF problem.whensent %] +

[% problem.duration_string(c) %]

+[% END %] -- cgit v1.2.3 From f10acf678577e3e5a691c8385a5c67944cd1ca2f Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Tue, 24 May 2016 16:59:56 +0100 Subject: [fixmystreet.com] Only output experiment on live. --- templates/web/fixmystreet.com/header_extra.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/web/fixmystreet.com/header_extra.html b/templates/web/fixmystreet.com/header_extra.html index e05bc31d2..0d53550eb 100644 --- a/templates/web/fixmystreet.com/header_extra.html +++ b/templates/web/fixmystreet.com/header_extra.html @@ -4,6 +4,7 @@ [%# We are conducting an A/B experiment %] +[% IF c.config.BASE_URL == "https://www.fixmystreet.com" %] +[% END %]