Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GeoView : Avoid to recreate html document when resizing.

Browse Source 
css enhancement. validate language in google, ...


svn: r13309
This commit is contained in:
Serge Noiraud 2009-10-05 20:30:26 +00:00
parent 44ccad19c4
commit b484a2b5fd
2 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/DataViews/GeoView.py
View File

@ -121,6 +121,7 @@ _JAVASCRIPT = '''<script>
var min = 0; var min = 0;
var zoom = 0; var zoom = 0;
var pos = 0; var pos = 0;
var mapstraction;
var regrep = new RegExp(\"default\",\"g\"); var regrep = new RegExp(\"default\",\"g\");
var selected = 0; var selected = 0;
var current_map = '{current_map}'; var current_map = '{current_map}';
@ -145,10 +146,10 @@ _JAVASCRIPT = '''<script>
}} }}
}} }}
}} }}
function savezoomandposition(mapstraction) {{ function savezoomandposition(map) {{
var t=setTimeout("savezoomandposition(mapstraction)",1000); var t=setTimeout("savezoomandposition(mapstraction)",1000);
nzoom = mapstraction.getZoom(); nzoom = map.getZoom();
nposition=mapstraction.getCenter(); nposition=map.getCenter();
if ( ( nzoom != zoom ) || ( nposition != pos )) {{ if ( ( nzoom != zoom ) || ( nposition != pos )) {{
zoom = nzoom; zoom = nzoom;
pos = nposition; pos = nposition;
@ -158,9 +159,9 @@ _JAVASCRIPT = '''<script>
function placeclick(i) {{ function placeclick(i) {{
gmarkers[i].openBubble(); gmarkers[i].openBubble();
}} }}
function removemarkers(mapstraction) {{ function removemarkers(map) {{
for ( m=0; m < gmarkers.length; m++) {{ for ( m=0; m < gmarkers.length; m++) {{
mapstraction.removeMarker(gmarkers[m]); map.removeMarker(gmarkers[m]);
}} }}
}} }}
function get_selected_radio() {{ function get_selected_radio() {{
@ -283,7 +284,6 @@ class GeoView(HtmlView):
self.nbpages = 0 self.nbpages = 0
self.yearinmarker = [] self.yearinmarker = []
self.mustcenter = False self.mustcenter = False
self.external_url = False
self.centerlat = 0.0 self.centerlat = 0.0
self.centerlon = 0.0 self.centerlon = 0.0
self.setattr = True self.setattr = True
@ -319,6 +319,8 @@ class GeoView(HtmlView):
self.htmlfile = "" self.htmlfile = ""
self.places = [] self.places = []
self.sort = [] self.sort = []
self.psort = []
self.plist = ""
self.without_coord_file = [] self.without_coord_file = []
self.place_without_coordinates = [] self.place_without_coordinates = []
self.minlat = 0.0 self.minlat = 0.0
@ -371,11 +373,9 @@ class GeoView(HtmlView):
gws = widget.get_allocation() gws = widget.get_allocation()
self.width = gws.width self.width = gws.width
self.height = gws.height self.height = gws.height
if not self.dbstate.active:
return
self.external_uri() self.external_uri()
try:
self._geo_places()
except:
pass
def set_active(self): def set_active(self):
""" """
@ -515,7 +515,7 @@ class GeoView(HtmlView):
5. store label so it can be changed when selection changes 5. store label so it can be changed when selection changes
""" """
PageView.PageView.change_page(self) PageView.PageView.change_page(self)
#menutoolbutton actions are stored in PageView class, # menutoolbutton actions are stored in PageView class,
# obtain the widgets where we need to add to menu # obtain the widgets where we need to add to menu
actionstyles = self.action_toolmenu['StyleSheet'] actionstyles = self.action_toolmenu['StyleSheet']
widgets = actionstyles.get_proxies() widgets = actionstyles.get_proxies()
@ -533,7 +533,7 @@ class GeoView(HtmlView):
if gtk.pygtk_version >= (2, 12, 0): if gtk.pygtk_version >= (2, 12, 0):
widget.set_arrow_tooltip_text(actionstyles.arrowtooltip) widget.set_arrow_tooltip_text(actionstyles.arrowtooltip)
lbl = gtk.Label(self.mapstyle_label()) lbl = gtk.Label(self.mapstyle_label())
self.stylesheetlbl=lbl self.stylesheetlbl = lbl
lbl.show() lbl.show()
self.stylesheetlabel.append(lbl) self.stylesheetlabel.append(lbl)
widget.set_label_widget(self.stylesheetlabel[-1]) widget.set_label_widget(self.stylesheetlabel[-1])
@ -560,7 +560,7 @@ class GeoView(HtmlView):
add_menuitem(menu, stylesheet[0], stylesheet[1] , add_menuitem(menu, stylesheet[0], stylesheet[1] ,
make_callback(self.set_mapstylesheet, make_callback(self.set_mapstylesheet,
stylesheet[1])) stylesheet[1]))
self.stylesheetdata[key] = [stylesheet[0],stylesheet[1]] self.stylesheetdata[key] = [stylesheet[0], stylesheet[1]]
return menu return menu
def mapstyle_label(self): def mapstyle_label(self):
@ -641,10 +641,11 @@ class GeoView(HtmlView):
""" """
Specifies the places to display with mapstraction. Specifies the places to display with mapstraction.
""" """
if not self.dbstate.active:
return
if self.nbmarkers > 0 : if self.nbmarkers > 0 :
# While the db is not loaded, we have 0 markers. # While the db is not loaded, we have 0 markers.
self._savezoomandposition() self._savezoomandposition()
self.external_url = False
self.nbmarkers = 0 self.nbmarkers = 0
self.without = 0 self.without = 0
self._createmapstraction(self.displaytype) self._createmapstraction(self.displaytype)
@ -781,8 +782,7 @@ class GeoView(HtmlView):
self.mapview.write("</script>\n") self.mapview.write("</script>\n")
self.mapview.write("</head>\n") self.mapview.write("</head>\n")
self.mapview.write("<body >\n") self.mapview.write("<body >\n")
self.mapview.write("<div id='geo-content' ") self.mapview.write("<div id='geo-content' >\n")
self.mapview.write(">\n")
if maxpages > 1: if maxpages > 1:
message = _("There are %d markers to display. They are split up " message = _("There are %d markers to display. They are split up "
"over %d pages of %d markers : " % (self.nbmarkers, "over %d pages of %d markers : " % (self.nbmarkers,
@ -853,8 +853,7 @@ class GeoView(HtmlView):
self.mapview.write("<H3>%s</H3>" % h3mess) self.mapview.write("<H3>%s</H3>" % h3mess)
if h4mess: if h4mess:
self.mapview.write("<H4>%s</H4>" % h4mess) self.mapview.write("<H4>%s</H4>" % h4mess)
margin = 10 self.mapview.write("</div>\n") # end geo-content
self.mapview.write("</div>\n")
self.mapview.write("<div id=\"openstreetmap\" class=\"Mapstraction\"") self.mapview.write("<div id=\"openstreetmap\" class=\"Mapstraction\"")
self.mapview.write(" style=\"height: %dpx\"></div>\n" % self.mapview.write(" style=\"height: %dpx\"></div>\n" %
(self.height - 130 )) (self.height - 130 ))
@ -872,7 +871,7 @@ class GeoView(HtmlView):
"placeclick(%d);\">%s</a></li>" % (place[1], place[0]) "placeclick(%d);\">%s</a></li>" % (place[1], place[0])
self.mapview.write("%s</ul></li></ul></div>\n" % self.plist) self.mapview.write("%s</ul></li></ul></div>\n" % self.plist)
self.mapview.write("<script type=\"text/javascript\">\n") self.mapview.write("<script type=\"text/javascript\">\n")
self.mapview.write(" var mapstraction = new Mapstraction") self.mapview.write(" mapstraction = new Mapstraction")
self.mapview.write("('openstreetmap','openstreetmap');\n") self.mapview.write("('openstreetmap','openstreetmap');\n")
self.mapview.write(" mapstraction.addControls(") self.mapview.write(" mapstraction.addControls(")
self.mapview.write("{ pan: true, zoom: 'large', ") self.mapview.write("{ pan: true, zoom: 'large', ")
@ -899,9 +898,13 @@ class GeoView(HtmlView):
""" """
self.mapview = open(filename, "w+") self.mapview = open(filename, "w+")
(lang_country, modifier ) = locale.getlocale() (lang_country, modifier ) = locale.getlocale()
if lang_country == None:
lang = "en"
else:
lang = lang_country.split('_')[0]
self.mapview.write( self.mapview.write(
_HTMLHEADER.format( _HTMLHEADER.format(
xmllang = "xml:lang=\"%s\"" % lang_country.split('_')[0], xmllang = "xml:lang=\"%s\"" % lang,
css = self._add_stylesheet() css = self._add_stylesheet()
) )
) )
@ -915,7 +918,7 @@ class GeoView(HtmlView):
self.mapview.write("</script>\n") self.mapview.write("</script>\n")
self.mapview.write("<script type=\"text/javascript\"") self.mapview.write("<script type=\"text/javascript\"")
self.mapview.write(" src=\"http://maps.google.com/") self.mapview.write(" src=\"http://maps.google.com/")
self.mapview.write("maps?file=api&v=2\">") self.mapview.write("maps?file=api&v=2&hl=%s\">" % lang )
self.mapview.write("</script>\n%s" % self._add_stylesheet()) self.mapview.write("</script>\n%s" % self._add_stylesheet())
if _alternate_map() == "microsoft": if _alternate_map() == "microsoft":
self.mapview.write("<script type=\"text/javascript\" ") self.mapview.write("<script type=\"text/javascript\" ")
@ -1139,7 +1142,7 @@ class GeoView(HtmlView):
self.yearinmarker = [] self.yearinmarker = []
ininterval = False ininterval = False
self.setattr = True self.setattr = True
self.mapview.write(" function setcenterandzoom(mapstraction) {\n") self.mapview.write(" function setcenterandzoom(map) {\n")
if self.mustcenter: if self.mustcenter:
self.centered = True self.centered = True
self.mapview.write(" var point = new LatLonPoint") self.mapview.write(" var point = new LatLonPoint")
@ -1148,14 +1151,14 @@ class GeoView(HtmlView):
self.reallongitude)) self.reallongitude))
else: else:
self.mapview.write("(%s,%s);" % (self.latit, self.longt)) self.mapview.write("(%s,%s);" % (self.latit, self.longt))
self.mapview.write("mapstraction.setCenterAndZoom") self.mapview.write("map.setCenterAndZoom")
if self.lock_action.get_action('SaveZoom').get_active(): if self.lock_action.get_action('SaveZoom').get_active():
self.mapview.write("(point, %s);\n" % self.realzoom) self.mapview.write("(point, %s);\n" % self.realzoom)
else: else:
self.mapview.write("(point, %s);\n" % self.zoom) self.mapview.write("(point, %s);\n" % self.zoom)
self.setattr = False self.setattr = False
self.mapview.write("}\n") self.mapview.write("}\n")
self.mapview.write(" function setmarkers(mapstraction) {\n") self.mapview.write(" function setmarkers(map) {\n")
self.mapview.write(" if ( current_map != \"openstreetmap\" ) {") self.mapview.write(" if ( current_map != \"openstreetmap\" ) {")
self.mapview.write(" default_icon = \"altmap\";") self.mapview.write(" default_icon = \"altmap\";")
self.mapview.write(" } else { ") self.mapview.write(" } else { ")
@ -1184,7 +1187,7 @@ class GeoView(HtmlView):
self.yearinmarker = [] self.yearinmarker = []
self._set_icon(savetype, differtype, formatype) self._set_icon(savetype, differtype, formatype)
differtype = False differtype = False
self.mapview.write("mapstraction.addMarker(my_marker);") self.mapview.write("map.addMarker(my_marker);")
indm += 1 indm += 1
if ( indm > lastm ): if ( indm > lastm ):
if (indm % NB_MARKERS_PER_PAGE) == 0: if (indm % NB_MARKERS_PER_PAGE) == 0:
@ -1244,14 +1247,14 @@ class GeoView(HtmlView):
self.mapview.write("</div>\");") self.mapview.write("</div>\");")
self.mapview.write("my_marker.setAttribute('year','%s');" % years) self.mapview.write("my_marker.setAttribute('year','%s');" % years)
self._set_icon(savetype, differtype, formatype) self._set_icon(savetype, differtype, formatype)
self.mapview.write("mapstraction.addMarker(my_marker);") self.mapview.write("map.addMarker(my_marker);")
if self.nbmarkers == 0: if self.nbmarkers == 0:
# We have no valid geographic point to center the map. # We have no valid geographic point to center the map.
longitude = 0.0 longitude = 0.0
latitude = 0.0 latitude = 0.0
self.mapview.write("\nvar point = new LatLonPoint") self.mapview.write("\nvar point = new LatLonPoint")
self.mapview.write("(%s,%s);\n" % (latitude, longitude)) self.mapview.write("(%s,%s);\n" % (latitude, longitude))
self.mapview.write(" mapstraction.setCenterAndZoom") self.mapview.write(" map.setCenterAndZoom")
self.mapview.write("(point, %d);\n" % 2) self.mapview.write("(point, %d);\n" % 2)
self.mapview.write(" my_marker = new Marker(point);\n") self.mapview.write(" my_marker = new Marker(point);\n")
self.mapview.write(" my_marker.setLabel") self.mapview.write(" my_marker.setLabel")
@ -1264,7 +1267,7 @@ class GeoView(HtmlView):
self.mapview.write(_("You are looking at the default map.")) self.mapview.write(_("You are looking at the default map."))
self.mapview.write("</div>\");\n") self.mapview.write("</div>\");\n")
self._set_icon(None, True, 1) self._set_icon(None, True, 1)
self.mapview.write(" mapstraction.addMarker(my_marker);") self.mapview.write(" map.addMarker(my_marker);")
self.mapview.write("\n}") self.mapview.write("\n}")
self.mapview.write("\n</script>\n") self.mapview.write("\n</script>\n")
@ -1420,8 +1423,6 @@ class GeoView(HtmlView):
latitude = place.get_latitude() latitude = place.get_latitude()
latitude, longitude = conv_lat_lon(latitude, longitude, latitude, longitude = conv_lat_lon(latitude, longitude,
"D.D8") "D.D8")
city = place.get_main_location().get_city()
country = place.get_main_location().get_country()
# place.get_longitude and place.get_latitude return # place.get_longitude and place.get_latitude return
# one string. We have coordinates when the two values # one string. We have coordinates when the two values
# contains non null string. # contains non null string.

47
src/data/GeoView.css
View File

@ -34,6 +34,8 @@ GRAMPS. If not, see <http://www.gnu.org/licenses/>.
# $Id: $ # $Id: $
GeoView Styles GeoView Styles
color:#2e3436; # tango color Aluminium
----------------------------------------------------- */ ----------------------------------------------------- */
#openstreetmap #openstreetmap
@ -41,6 +43,8 @@ GRAMPS. If not, see <http://www.gnu.org/licenses/>.
border: 3px black solid; border: 3px black solid;
margin-left:auto; margin-left:auto;
margin-right:auto; margin-right:auto;
min-height:400px;
min-width: 300px;
} }
#google #google
@ -48,6 +52,8 @@ GRAMPS. If not, see <http://www.gnu.org/licenses/>.
border: 3px black solid; border: 3px black solid;
margin-left:auto; margin-left:auto;
margin-right:auto; margin-right:auto;
min-height:400px;
min-width: 300px;
} }
#openlayers #openlayers
@ -55,6 +61,8 @@ GRAMPS. If not, see <http://www.gnu.org/licenses/>.
border: 3px black solid; border: 3px black solid;
margin-left:auto; margin-left:auto;
margin-right:auto; margin-right:auto;
min-height:400px;
min-width: 300px;
} }
#microsoft #microsoft
@ -62,6 +70,8 @@ GRAMPS. If not, see <http://www.gnu.org/licenses/>.
border: 3px black solid; border: 3px black solid;
margin-left:auto; margin-left:auto;
margin-right:auto; margin-right:auto;
min-height:400px;
min-width: 300px;
} }
#yahoo #yahoo
@ -69,6 +79,8 @@ GRAMPS. If not, see <http://www.gnu.org/licenses/>.
border: 3px black solid; border: 3px black solid;
margin-left:auto; margin-left:auto;
margin-right:auto; margin-right:auto;
min-height:400px;
min-width: 300px;
} }
/* InfoWindow */ /* InfoWindow */
@ -89,9 +101,8 @@ GRAMPS. If not, see <http://www.gnu.org/licenses/>.
top:0; top:0;
left:0; left:0;
font-size:10pt; font-size:10pt;
height:100px; height:90px;
width=100% overflow-y:auto;
overflow:auto;
} }
#geo-theplaces ul { #geo-theplaces ul {
@ -103,8 +114,7 @@ GRAMPS. If not, see <http://www.gnu.org/licenses/>.
padding: 0; padding: 0;
} }
#geo-title #geo-title {
{
list-style-type: none; list-style-type: none;
margin-left: 5px; margin-left: 5px;
} }
@ -126,10 +136,8 @@ GRAMPS. If not, see <http://www.gnu.org/licenses/>.
#geo-liste:hover li { #geo-liste:hover li {
} }
#geo-theplaces #geo-theplaces {
{
position:absolute; position:absolute;
opacity:.90;
color:#2e3436; color:#2e3436;
top:120px; top:120px;
left:100px; left:100px;
@ -137,47 +145,38 @@ GRAMPS. If not, see <http://www.gnu.org/licenses/>.
border: 0px; border: 0px;
overflow:auto; overflow:auto;
max-height:50%; max-height:50%;
z-index:800; /* must be greater than 748 to be visible on openlayers */
} }
#geo-theplace #geo-theplace {
{
display: block; display: block;
} }
#geo-theplace a #geo-theplace a {
{
color: #2e3436; color: #2e3436;
display: block; display: block;
} }
#geo-theplace a:visited #geo-theplace a:visited {
{
color: #2e3436; color: #2e3436;
background-color: transparent; background-color: transparent;
text-decoration:none; text-decoration:none;
opacity:1.0;
} }
#geo-theplace a:active #geo-theplace a:active {
{
color: #2e3436; color: #2e3436;
background-color: transparent; background-color: transparent;
text-decoration:none; text-decoration:none;
opacity:1.0;
} }
#geo-theplaces a:hover #geo-theplaces a:hover {
{
color: #2e3436; color: #2e3436;
background-color: transparent; background-color: transparent;
text-decoration:none; text-decoration:none;
opacity:1.0;
} }
#geo-theplace a:hover #geo-theplace a:hover {
{
color: #2e3436; color: #2e3436;
background-color: transparent; background-color: transparent;
text-decoration:none; text-decoration:none;
opacity:1.0;
} }