Skip to content

Commit

Permalink
v3.2.0
Browse files Browse the repository at this point in the history
Permalink modal
  • Loading branch information
Dr-Mx committed Oct 7, 2017
1 parent e76bcc4 commit 0dbd663
Show file tree
Hide file tree
Showing 41 changed files with 757 additions and 486 deletions.
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
# CHANGELOG

## v3.2.0 - Permalink modal

**Date:** 07/10/2017

Updated js
- Control.Geocoder.js 1.5.5
- URI.js 1.19.0

Site changes
- New modal to share permalink to clipboard in a click
- Redesigned favicon
- POI results list now shows items facilities
- Loop gallery of images within popups
- Improve POI tab population code
- Add emergency & copyshop/printer POIs
- Various other improvements


## v3.1.0 - Multiple images

**Date:** 30/08/2017
Expand Down
Binary file modified web/android-chrome-192x192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified web/android-chrome-512x512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified web/apple-touch-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
99 changes: 73 additions & 26 deletions web/assets/css/site.css
Original file line number Diff line number Diff line change
Expand Up @@ -32,27 +32,24 @@ html, body, #map {
}
.navigateItem {
position: absolute;
right: 22px;
margin-top: -15px;
opacity: 0.5;
}
.navigateItem .fa {
width: 20px;
.navigateItem .fa, .navigateItemPrev, .navigateItemNext {
width: 18px;
opacity: 0.5;
}
.navigateItem:hover {
opacity: 1;
.navigateItem > .fa {
text-align: center;
}
.prevItem {
right: 50px;
.navigateItemPrev {
text-align: left;
}
.nextItem {
width: 20px;
right: 20px;
.navigateItemNext {
text-align: right;
}
.imgIcon {
right: 32px;
pointer-events: none;
.navigateItemNext:hover, .navigateItemPrev:hover {
opacity: 1;
}

#feedRss {
Expand Down Expand Up @@ -229,6 +226,43 @@ hr {
text-shadow: 0 0 15px rgba(0, 0, 0, 0.3);
}

#modalPermalink {
position: absolute;
display: none;
background-color: rgba(222, 222, 222, 0.9);
top: 0;
left: 30px;
padding: 15px;
font-weight: bold;
}
.btnCloseModal {
position: absolute;
right: 10px;
background-color: transparent;
}
#inputPermalink {
font: inherit;
font-weight: normal;
font-size: 10pt;
min-width: 200px;
min-height: 55px;
word-break: break-all;
}
#btnCopyPermalink {
margin-top: 5px;
border: 0;
border-radius: 4px;
box-shadow: 1px 1px #ccc;
background-color: #fff;
font-weight: inherit;
height: 26px;
width: 100%;
}
#btnCopyPermalink:hover {
background-color: #f4f4f4;
}


/* poi tab */
.poi-results {
height: 0;
Expand All @@ -245,11 +279,11 @@ hr {
height: 26px;
background-color: #fff;
}
.poi-results-btn-clear {
#btnPoiResultsClear {
display: none;
right: 45px;
}
.poi-results-btn-view {
#btnPoiResultsView {
right: 15px;
}
.poi-results-list {
Expand All @@ -264,7 +298,7 @@ hr {
}
.poi-results-list td {
border-bottom: 1px solid #bbb;
padding: 3px;
padding: 3px 1px;
}
.poi-results-list td:first-child {
text-align: center;
Expand Down Expand Up @@ -321,7 +355,7 @@ hr {
pointer-events: none;
opacity: 0.5;
}
.poi-checkbox > label:hover, .walkLink:hover {
.poi-checkbox > label:hover {
filter: brightness(80%) saturate(100%);
background-color: rgba(255, 255, 255);
}
Expand All @@ -343,10 +377,22 @@ hr {
padding: 0 .5em 0 0;
font-size: 100%;
}
#walkContainer > div {
padding-left: 10px;
}
#walkContainer > div .fa {
font-size: 10pt;
}
.walkLink {
display: table;
color: darkgreen;
text-indent: 3px;
border-radius: 3px;
text-indent: -10px;
padding-left: 20px;
margin-bottom: 7px;
cursor: pointer;
}
.walkLink:hover {
background-color: rgba(255,255,255,0.6);
}

/* tour tab */
Expand Down Expand Up @@ -502,8 +548,8 @@ input[type=range]:focus::-ms-fill-upper {

/* information tab */
#information ul {
padding-left: 20px;
list-style-type: circle;
padding-left: 10px;
list-style-type: none;
}
#information td:hover {
filter: brightness(80%);
Expand Down Expand Up @@ -607,27 +653,28 @@ input[type=range]:focus::-ms-fill-upper {
font: 95% monospace;
}
.popup-imgContainer {
margin-top: 10px;
margin-top: 5px;
text-align: center;
}
.popup-imgContainer > img {
border: 2px solid #ccc;
border-radius: 5px;
}
.popup-imgAttrib, .popup-imgAttrib a:link, .popup-imgAttrib a:visited, .popup-imgAttrib a:hover {
font-size: 75%;
font-size: 6pt;
color: #808080;
}
.popup-fhrs, .popup-fhrs > img {
width: 80px;
filter: saturate(70%);
text-indent: 0;
display: inline-block;
}
.leaflet-popup img {
margin-top: -4px;
margin-bottom: -4px;
}
.popup-imgBooking {
width: 80px;
margin-bottom: -3px;
}
.leaflet-popup-content-wrapper, .leaflet-popup-tip {
background-color: rgba(244, 244, 244, 0.95);
}
Expand Down
Binary file modified web/assets/img/help-results.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added web/assets/img/icons/ambulance.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added web/assets/img/icons/clock.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed web/assets/img/icons/disability.png
Binary file not shown.
Binary file modified web/assets/img/icons/firetruck.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added web/assets/img/icons/lake2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added web/assets/img/icons/landmark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified web/assets/img/icons/memorial.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added web/assets/img/icons/printer-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added web/assets/img/icons/statue-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added web/assets/img/icons/steamtrain.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added web/assets/img/icons/war_memorial.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 8 additions & 6 deletions web/assets/js/Control.Geocoder.min.js

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions web/assets/js/OverPassLayer.js
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,11 @@ L.OverPassLayer = L.FeatureGroup.extend({
var result = [];
for (var x=lidx; x<=ridx; x++) {
for (var y=tidx; y<=bidx; y++) {
var left = (this.tile2long(x,requestZoomLevel) < mapBounds.lef) ? mapBounds.lef : Math.round(this.tile2long(x,requestZoomLevel)*1000000)/1000000;
var bottom = (this.tile2lat(y+1,requestZoomLevel) < mapBounds.bot) ? mapBounds.bot : Math.round(this.tile2lat(y+1,requestZoomLevel)*1000000)/1000000;
var right = (this.tile2long(x+1,requestZoomLevel) > mapBounds.rig) ? mapBounds.rig : Math.round(this.tile2long(x+1,requestZoomLevel)*1000000)/1000000;
var top = (this.tile2lat(y,requestZoomLevel) > mapBounds.top) ? mapBounds.top : Math.round(this.tile2lat(y,requestZoomLevel)*1000000)/1000000;
result.push(new L.LatLngBounds(new L.LatLng(bottom, left), new L.LatLng(top, right)));
var west = (this.tile2long(x,requestZoomLevel) < mapBounds.west) ? mapBounds.west : Math.round(this.tile2long(x,requestZoomLevel)*1000000)/1000000;
var south = (this.tile2lat(y+1,requestZoomLevel) < mapBounds.south) ? mapBounds.south : Math.round(this.tile2lat(y+1,requestZoomLevel)*1000000)/1000000;
var east = (this.tile2long(x+1,requestZoomLevel) > mapBounds.east) ? mapBounds.east : Math.round(this.tile2long(x+1,requestZoomLevel)*1000000)/1000000;
var north = (this.tile2lat(y,requestZoomLevel) > mapBounds.north) ? mapBounds.north : Math.round(this.tile2lat(y,requestZoomLevel)*1000000)/1000000;
result.push(new L.LatLngBounds(new L.LatLng(south, west), new L.LatLng(north, east)));
}
}
return result;
Expand All @@ -140,7 +140,7 @@ L.OverPassLayer = L.FeatureGroup.extend({
this._map.getBounds()._northEast.lat
);
}
else bboxList.push(new L.LatLngBounds(new L.LatLng(mapBounds.bot, mapBounds.lef), new L.LatLng(mapBounds.top, mapBounds.rig)));
else bboxList.push(new L.LatLngBounds(new L.LatLng(mapBounds.south, mapBounds.west), new L.LatLng(mapBounds.north, mapBounds.east)));
// controls the after/before (Request) callbacks
var finishedCount = 0;
var queryCount = bboxList.length;
Expand Down
Loading

0 comments on commit 0dbd663

Please sign in to comment.