gui handling now uses a main class in which all other gui classes plug
in
This commit is contained in:
parent
8e79b29925
commit
448e6cfdc7
@ -15,123 +15,30 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|||||||
or see http://www.gnu.org/licenses/agpl.txt.
|
or see http://www.gnu.org/licenses/agpl.txt.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// OSRM GUI functionality
|
// OSRM GUI
|
||||||
// [responsible for all non-routing related GUI behaviour]
|
// [base GUI class, all other GUI modules extend this class]
|
||||||
|
|
||||||
|
|
||||||
OSRM.GUI = {
|
OSRM.GUI = {
|
||||||
|
|
||||||
// defaults
|
// initialization functions of all GUI parts
|
||||||
visible: null,
|
init_functions: [],
|
||||||
width: null,
|
|
||||||
|
|
||||||
// init GUI
|
// init GUI
|
||||||
init: function() {
|
init: function() {
|
||||||
OSRM.GUI.visible = true;
|
for(var i=0, size=OSRM.GUI.init_functions.length; i<size; i++) {
|
||||||
OSRM.GUI.width = document.getElementById("main-wrapper").clientWidth;
|
OSRM.GUI.init_functions[i]();
|
||||||
|
|
||||||
// init starting source/target
|
|
||||||
document.getElementById('gui-input-source').value = OSRM.DEFAULTS.ONLOAD_SOURCE;
|
|
||||||
document.getElementById('gui-input-target').value = OSRM.DEFAULTS.ONLOAD_TARGET;
|
|
||||||
|
|
||||||
// init events
|
|
||||||
// [TODO: switch to new event model]
|
|
||||||
document.getElementById("gui-toggle-in").onclick = OSRM.GUI.toggleMain;
|
|
||||||
document.getElementById("gui-toggle-out").onclick = OSRM.GUI.toggleMain;
|
|
||||||
|
|
||||||
document.getElementById("gui-input-source").onchange = function() {OSRM.RoutingGUI.inputChanged(OSRM.C.SOURCE_LABEL);};
|
|
||||||
document.getElementById("gui-delete-source").onclick = function() {OSRM.RoutingGUI.deleteMarker(OSRM.C.SOURCE_LABEL);};
|
|
||||||
document.getElementById("gui-search-source").onclick = function() {OSRM.RoutingGUI.showMarker(OSRM.C.SOURCE_LABEL);};
|
|
||||||
|
|
||||||
document.getElementById("gui-input-target").onchange = function() {OSRM.RoutingGUI.inputChanged(OSRM.C.TARGET_LABEL);};
|
|
||||||
document.getElementById("gui-delete-target").onclick = function() {OSRM.RoutingGUI.deleteMarker(OSRM.C.TARGET_LABEL);};
|
|
||||||
document.getElementById("gui-search-target").onclick = function() {OSRM.RoutingGUI.showMarker(OSRM.C.TARGET_LABEL);};
|
|
||||||
|
|
||||||
document.getElementById("gui-reset").onclick = OSRM.RoutingGUI.resetRouting;
|
|
||||||
document.getElementById("gui-reverse").onclick = OSRM.RoutingGUI.reverseRouting;
|
|
||||||
document.getElementById("gui-options-toggle").onclick = OSRM.GUI.toggleOptions;
|
|
||||||
document.getElementById("open-josm").onclick = OSRM.RoutingGUI.openJOSM;
|
|
||||||
document.getElementById("open-osmbugs").onclick = OSRM.RoutingGUI.openOSMBugs;
|
|
||||||
document.getElementById("option-highlight-nonames").onclick = OSRM.Routing.getZoomRoute;
|
|
||||||
|
|
||||||
// gui after transition events
|
|
||||||
if( OSRM.Browser.FF3==-1 && OSRM.Browser.IE6_9==-1 ) {
|
|
||||||
document.getElementById('main-wrapper').addEventListener("transitionend", OSRM.GUI.onMainTransitionEnd, false);
|
|
||||||
document.getElementById('main-wrapper').addEventListener("webkitTransitionEnd", OSRM.GUI.onMainTransitionEnd, false);
|
|
||||||
document.getElementById('main-wrapper').addEventListener("oTransitionEnd", OSRM.GUI.onMainTransitionEnd, false);
|
|
||||||
document.getElementById('main-wrapper').addEventListener("MSTransitionEnd", OSRM.GUI.onMainTransitionEnd, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
// set default language
|
|
||||||
OSRM.Localization.setLanguage( OSRM.DEFAULTS.LANGUAGE );
|
|
||||||
},
|
|
||||||
|
|
||||||
// set language dependent labels
|
|
||||||
setLabels: function() {
|
|
||||||
document.getElementById("open-josm").innerHTML = OSRM.loc("OPEN_JOSM");
|
|
||||||
document.getElementById("open-osmbugs").innerHTML = OSRM.loc("OPEN_OSMBUGS");
|
|
||||||
document.getElementById("gui-reset").innerHTML = OSRM.loc("GUI_RESET");
|
|
||||||
document.getElementById("gui-reverse").innerHTML = OSRM.loc("GUI_REVERSE");
|
|
||||||
document.getElementById("gui-option-highlight-nonames-label").innerHTML = OSRM.loc("GUI_HIGHLIGHT_UNNAMED_ROADS");
|
|
||||||
document.getElementById("gui-options-toggle").innerHTML = OSRM.loc("GUI_OPTIONS");
|
|
||||||
document.getElementById("gui-search-source").innerHTML = OSRM.loc("GUI_SEARCH");
|
|
||||||
document.getElementById("gui-search-target").innerHTML = OSRM.loc("GUI_SEARCH");
|
|
||||||
document.getElementById("gui-search-source-label").innerHTML = OSRM.loc("GUI_START")+":";
|
|
||||||
document.getElementById("gui-search-target-label").innerHTML = OSRM.loc("GUI_END")+":";
|
|
||||||
document.getElementById("gui-input-source").title = OSRM.loc("GUI_START_TOOLTIP");
|
|
||||||
document.getElementById("gui-input-target").title = OSRM.loc("GUI_END_TOOLTIP");
|
|
||||||
document.getElementById("legal-notice").innerHTML = OSRM.loc("GUI_LEGAL_NOTICE");
|
|
||||||
},
|
|
||||||
|
|
||||||
// show/hide main-gui
|
|
||||||
toggleMain: function() {
|
|
||||||
// show main-gui
|
|
||||||
if( OSRM.GUI.visible == false ) {
|
|
||||||
OSRM.Browser.getElementsByClassName(document,'leaflet-control-zoom')[0].style.visibility="hidden";
|
|
||||||
OSRM.Browser.getElementsByClassName(document,'leaflet-control-zoom')[0].style.left=(OSRM.GUI.width+10)+"px";;
|
|
||||||
|
|
||||||
document.getElementById('blob-wrapper').style.visibility="hidden";
|
|
||||||
document.getElementById('main-wrapper').style.left="5px";
|
|
||||||
// hide main-gui
|
|
||||||
} else {
|
|
||||||
OSRM.Browser.getElementsByClassName(document,'leaflet-control-zoom')[0].style.visibility="hidden";
|
|
||||||
OSRM.Browser.getElementsByClassName(document,'leaflet-control-zoom')[0].style.left="30px";
|
|
||||||
|
|
||||||
document.getElementById('main-wrapper').style.left=-OSRM.GUI.width+"px";
|
|
||||||
}
|
|
||||||
|
|
||||||
// execute after animation (old browser support)
|
|
||||||
if( OSRM.Browser.FF3!=-1 || OSRM.Browser.IE6_9!=-1 )
|
|
||||||
OSRM.GUI.onMainTransitionEnd();
|
|
||||||
},
|
|
||||||
|
|
||||||
// do stuff after main-gui animation finished
|
|
||||||
onMainTransitionEnd: function() {
|
|
||||||
// after hiding main-gui
|
|
||||||
if( OSRM.GUI.visible == true ) {
|
|
||||||
document.getElementById('blob-wrapper').style.visibility="visible";
|
|
||||||
OSRM.Browser.getElementsByClassName(document,'leaflet-control-zoom')[0].style.visibility="visible";
|
|
||||||
OSRM.GUI.visible = false;
|
|
||||||
// after showing main-gui
|
|
||||||
} else {
|
|
||||||
OSRM.Browser.getElementsByClassName(document,'leaflet-control-zoom')[0].style.visibility="visible";
|
|
||||||
OSRM.GUI.visible = true;
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
// show/hide small options bubble
|
//extend GUI class and add init functions to the array
|
||||||
toggleOptions: function() {
|
extend: function( properties ) {
|
||||||
if(document.getElementById('options-box').style.visibility=="visible") {
|
for( property in properties ) {
|
||||||
document.getElementById('options-box').style.visibility="hidden";
|
if( property == 'init' )
|
||||||
} else {
|
OSRM.GUI.init_functions.push( properties[property] );
|
||||||
document.getElementById('options-box').style.visibility="visible";
|
else
|
||||||
|
OSRM.GUI[property] = properties[property];
|
||||||
}
|
}
|
||||||
},
|
}
|
||||||
|
|
||||||
// clear output area
|
};
|
||||||
clearResults: function() {
|
|
||||||
document.getElementById('information-box').innerHTML = "";
|
|
||||||
document.getElementById('information-box-header').innerHTML = "";
|
|
||||||
}
|
|
||||||
|
|
||||||
};
|
|
121
WebContent/gui/OSRM.MainGUI.js
Normal file
121
WebContent/gui/OSRM.MainGUI.js
Normal file
@ -0,0 +1,121 @@
|
|||||||
|
/*
|
||||||
|
This program is free software; you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU AFFERO General Public License as published by
|
||||||
|
the Free Software Foundation; either version 3 of the License, or
|
||||||
|
any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Affero General Public License
|
||||||
|
along with this program; if not, write to the Free Software
|
||||||
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
|
or see http://www.gnu.org/licenses/agpl.txt.
|
||||||
|
*/
|
||||||
|
|
||||||
|
// OSRM MainGUI
|
||||||
|
// [handles all GUI events that interact with appearance of main window]
|
||||||
|
|
||||||
|
|
||||||
|
OSRM.GUI.extend( {
|
||||||
|
|
||||||
|
// defaults
|
||||||
|
visible: null,
|
||||||
|
width: null,
|
||||||
|
|
||||||
|
// init GUI
|
||||||
|
init: function() {
|
||||||
|
OSRM.GUI.visible = true;
|
||||||
|
OSRM.GUI.width = document.getElementById("main-wrapper").clientWidth;
|
||||||
|
|
||||||
|
// init starting source/target
|
||||||
|
document.getElementById('gui-input-source').value = OSRM.DEFAULTS.ONLOAD_SOURCE;
|
||||||
|
document.getElementById('gui-input-target').value = OSRM.DEFAULTS.ONLOAD_TARGET;
|
||||||
|
|
||||||
|
// init events
|
||||||
|
document.getElementById("gui-toggle-in").onclick = OSRM.GUI.toggleMain;
|
||||||
|
document.getElementById("gui-toggle-out").onclick = OSRM.GUI.toggleMain;
|
||||||
|
|
||||||
|
// gui after transition events
|
||||||
|
if( OSRM.Browser.FF3==-1 && OSRM.Browser.IE6_9==-1 ) {
|
||||||
|
document.getElementById('main-wrapper').addEventListener("transitionend", OSRM.GUI._onMainTransitionEnd, false);
|
||||||
|
document.getElementById('main-wrapper').addEventListener("webkitTransitionEnd", OSRM.GUI._onMainTransitionEnd, false);
|
||||||
|
document.getElementById('main-wrapper').addEventListener("oTransitionEnd", OSRM.GUI._onMainTransitionEnd, false);
|
||||||
|
document.getElementById('main-wrapper').addEventListener("MSTransitionEnd", OSRM.GUI._onMainTransitionEnd, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
// set default language
|
||||||
|
OSRM.Localization.setLanguage( OSRM.DEFAULTS.LANGUAGE );
|
||||||
|
},
|
||||||
|
|
||||||
|
// set language dependent labels
|
||||||
|
setLabels: function() {
|
||||||
|
document.getElementById("open-josm").innerHTML = OSRM.loc("OPEN_JOSM");
|
||||||
|
document.getElementById("open-osmbugs").innerHTML = OSRM.loc("OPEN_OSMBUGS");
|
||||||
|
document.getElementById("gui-reset").innerHTML = OSRM.loc("GUI_RESET");
|
||||||
|
document.getElementById("gui-reverse").innerHTML = OSRM.loc("GUI_REVERSE");
|
||||||
|
document.getElementById("gui-option-highlight-nonames-label").innerHTML = OSRM.loc("GUI_HIGHLIGHT_UNNAMED_ROADS");
|
||||||
|
document.getElementById("gui-options-toggle").innerHTML = OSRM.loc("GUI_OPTIONS");
|
||||||
|
document.getElementById("gui-search-source").innerHTML = OSRM.loc("GUI_SEARCH");
|
||||||
|
document.getElementById("gui-search-target").innerHTML = OSRM.loc("GUI_SEARCH");
|
||||||
|
document.getElementById("gui-search-source-label").innerHTML = OSRM.loc("GUI_START")+":";
|
||||||
|
document.getElementById("gui-search-target-label").innerHTML = OSRM.loc("GUI_END")+":";
|
||||||
|
document.getElementById("gui-input-source").title = OSRM.loc("GUI_START_TOOLTIP");
|
||||||
|
document.getElementById("gui-input-target").title = OSRM.loc("GUI_END_TOOLTIP");
|
||||||
|
document.getElementById("legal-notice").innerHTML = OSRM.loc("GUI_LEGAL_NOTICE");
|
||||||
|
},
|
||||||
|
|
||||||
|
//clear output area
|
||||||
|
clearResults: function() {
|
||||||
|
document.getElementById('information-box').innerHTML = "";
|
||||||
|
document.getElementById('information-box-header').innerHTML = "";
|
||||||
|
},
|
||||||
|
|
||||||
|
//show/hide small options bubble
|
||||||
|
toggleOptions: function() {
|
||||||
|
if(document.getElementById('options-box').style.visibility=="visible") {
|
||||||
|
document.getElementById('options-box').style.visibility="hidden";
|
||||||
|
} else {
|
||||||
|
document.getElementById('options-box').style.visibility="visible";
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
// show/hide main-gui
|
||||||
|
toggleMain: function() {
|
||||||
|
// show main-gui
|
||||||
|
if( OSRM.GUI.visible == false ) {
|
||||||
|
OSRM.Browser.getElementsByClassName(document,'leaflet-control-zoom')[0].style.visibility="hidden";
|
||||||
|
OSRM.Browser.getElementsByClassName(document,'leaflet-control-zoom')[0].style.left=(OSRM.GUI.width+10)+"px";;
|
||||||
|
|
||||||
|
document.getElementById('blob-wrapper').style.visibility="hidden";
|
||||||
|
document.getElementById('main-wrapper').style.left="5px";
|
||||||
|
// hide main-gui
|
||||||
|
} else {
|
||||||
|
OSRM.Browser.getElementsByClassName(document,'leaflet-control-zoom')[0].style.visibility="hidden";
|
||||||
|
OSRM.Browser.getElementsByClassName(document,'leaflet-control-zoom')[0].style.left="30px";
|
||||||
|
|
||||||
|
document.getElementById('main-wrapper').style.left=-OSRM.GUI.width+"px";
|
||||||
|
}
|
||||||
|
|
||||||
|
// execute after animation (old browser support)
|
||||||
|
if( OSRM.Browser.FF3!=-1 || OSRM.Browser.IE6_9!=-1 )
|
||||||
|
OSRM.GUI._onMainTransitionEnd();
|
||||||
|
},
|
||||||
|
|
||||||
|
// do stuff after main-gui animation finished
|
||||||
|
_onMainTransitionEnd: function() {
|
||||||
|
// after hiding main-gui
|
||||||
|
if( OSRM.GUI.visible == true ) {
|
||||||
|
document.getElementById('blob-wrapper').style.visibility="visible";
|
||||||
|
OSRM.Browser.getElementsByClassName(document,'leaflet-control-zoom')[0].style.visibility="visible";
|
||||||
|
OSRM.GUI.visible = false;
|
||||||
|
// after showing main-gui
|
||||||
|
} else {
|
||||||
|
OSRM.Browser.getElementsByClassName(document,'leaflet-control-zoom')[0].style.visibility="visible";
|
||||||
|
OSRM.GUI.visible = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
});
|
@ -16,10 +16,29 @@ or see http://www.gnu.org/licenses/agpl.txt.
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
// OSRM RoutingGUI
|
// OSRM RoutingGUI
|
||||||
// [handles all GUI events that interact with routing]
|
// [handles all GUI events that interact with routing in main window]
|
||||||
|
|
||||||
|
|
||||||
OSRM.RoutingGUI = {
|
OSRM.GUI.extend( {
|
||||||
|
|
||||||
|
// init
|
||||||
|
init: function() {
|
||||||
|
// init events
|
||||||
|
document.getElementById("gui-input-source").onchange = function() {OSRM.GUI.inputChanged(OSRM.C.SOURCE_LABEL);};
|
||||||
|
document.getElementById("gui-delete-source").onclick = function() {OSRM.GUI.deleteMarker(OSRM.C.SOURCE_LABEL);};
|
||||||
|
document.getElementById("gui-search-source").onclick = function() {OSRM.GUI.showMarker(OSRM.C.SOURCE_LABEL);};
|
||||||
|
|
||||||
|
document.getElementById("gui-input-target").onchange = function() {OSRM.GUI.inputChanged(OSRM.C.TARGET_LABEL);};
|
||||||
|
document.getElementById("gui-delete-target").onclick = function() {OSRM.GUI.deleteMarker(OSRM.C.TARGET_LABEL);};
|
||||||
|
document.getElementById("gui-search-target").onclick = function() {OSRM.GUI.showMarker(OSRM.C.TARGET_LABEL);};
|
||||||
|
|
||||||
|
document.getElementById("gui-reset").onclick = OSRM.GUI.resetRouting;
|
||||||
|
document.getElementById("gui-reverse").onclick = OSRM.GUI.reverseRouting;
|
||||||
|
document.getElementById("gui-options-toggle").onclick = OSRM.GUI.toggleOptions;
|
||||||
|
document.getElementById("open-josm").onclick = OSRM.GUI.openJOSM;
|
||||||
|
document.getElementById("open-osmbugs").onclick = OSRM.GUI.openOSMBugs;
|
||||||
|
document.getElementById("option-highlight-nonames").onclick = OSRM.Routing.getZoomRoute;
|
||||||
|
},
|
||||||
|
|
||||||
// click: button "reset"
|
// click: button "reset"
|
||||||
resetRouting: function() {
|
resetRouting: function() {
|
||||||
@ -117,4 +136,4 @@ deleteMarker: function(marker_id) {
|
|||||||
OSRM.G.markers.highlight.hide();
|
OSRM.G.markers.highlight.hide();
|
||||||
}
|
}
|
||||||
|
|
||||||
};
|
});
|
||||||
|
@ -58,6 +58,7 @@ or see http://www.gnu.org/licenses/agpl.txt.
|
|||||||
<script src="base/OSRM.Markers.js" type="text/javascript"></script>
|
<script src="base/OSRM.Markers.js" type="text/javascript"></script>
|
||||||
<script src="base/OSRM.Routes.js" type="text/javascript"></script>
|
<script src="base/OSRM.Routes.js" type="text/javascript"></script>
|
||||||
<script src="gui/OSRM.GUI.js" type="text/javascript"></script>
|
<script src="gui/OSRM.GUI.js" type="text/javascript"></script>
|
||||||
|
<script src="gui/OSRM.MainGUI.js" type="text/javascript"></script>
|
||||||
<script src="routing/OSRM.Routing.js" type="text/javascript"></script>
|
<script src="routing/OSRM.Routing.js" type="text/javascript"></script>
|
||||||
<script src="routing/OSRM.RoutingDescription.js" type="text/javascript"></script>
|
<script src="routing/OSRM.RoutingDescription.js" type="text/javascript"></script>
|
||||||
<script src="routing/OSRM.RoutingGeometry.js" type="text/javascript"></script>
|
<script src="routing/OSRM.RoutingGeometry.js" type="text/javascript"></script>
|
||||||
|
Loading…
Reference in New Issue
Block a user