SF Bugs#113: Fix waypoints can be accidentally moved on (re)selection by the select...

[andy/viking.git] / src / vikwmscmapsource.c

diff --git a/src/vikwmscmapsource.c b/src/vikwmscmapsource.c
index 5b760312b0ba873913af4b7a66f98a40be4c717b..5821c0616af3ff83acea73cb1746e1ea5d1ad04a 100644 (file)
--- a/src/vikwmscmapsource.c
+++ b/src/vikwmscmapsource.c
@@ -5,7 +5,7 @@
  * 
  * viking is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
  * 
  * viking is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the

- * Free Software Foundation, either version 3 of the License, or
+ * Free Software Foundation, either version 2 of the License, or

  * (at your option) any later version.
  * 
  * viking is distributed in the hope that it will be useful, but
  * (at your option) any later version.
  * 
  * viking is distributed in the hope that it will be useful, but


@@ -42,6 +42,14 @@ static gboolean _coord_to_mapcoord ( VikMapSource *self, const VikCoord *src, gd
 static void _mapcoord_to_center_coord ( VikMapSource *self, MapCoord *src, VikCoord *dest );
 static gboolean _supports_download_only_new ( VikMapSource *self );
 static gboolean _is_direct_file_access ( VikMapSource *self );
 static void _mapcoord_to_center_coord ( VikMapSource *self, MapCoord *src, VikCoord *dest );
 static gboolean _supports_download_only_new ( VikMapSource *self );
 static gboolean _is_direct_file_access ( VikMapSource *self );

+static gboolean _is_mbtiles ( VikMapSource *self );
+static gboolean _is_osm_meta_tiles (VikMapSource *self );
+static guint8 _get_zoom_min(VikMapSource *self );
+static guint8 _get_zoom_max(VikMapSource *self );
+static gdouble _get_lat_min(VikMapSource *self );
+static gdouble _get_lat_max(VikMapSource *self );
+static gdouble _get_lon_min(VikMapSource *self );
+static gdouble _get_lon_max(VikMapSource *self );

 
 static gchar *_get_uri( VikMapSourceDefault *self, MapCoord *src );
 static gchar *_get_hostname( VikMapSourceDefault *self );
 
 static gchar *_get_uri( VikMapSourceDefault *self, MapCoord *src );
 static gchar *_get_hostname( VikMapSourceDefault *self );


@@ -53,6 +61,12 @@ struct _VikWmscMapSourcePrivate
   gchar *hostname;
   gchar *url;
   DownloadMapOptions options;
   gchar *hostname;
   gchar *url;
   DownloadMapOptions options;

+  guint zoom_min; // TMS Zoom level: 0 = Whole World // http://wiki.openstreetmap.org/wiki/Slippy_map_tilenames
+  guint zoom_max; // TMS Zoom level: Often 18 for zoomed in.
+  gdouble lat_min; // Degrees
+  gdouble lat_max; // Degrees
+  gdouble lon_min; // Degrees
+  gdouble lon_max; // Degrees

 };
 
 #define VIK_WMSC_MAP_SOURCE_PRIVATE(o)  (G_TYPE_INSTANCE_GET_PRIVATE ((o), VIK_TYPE_WMSC_MAP_SOURCE, VikWmscMapSourcePrivate))
 };
 
 #define VIK_WMSC_MAP_SOURCE_PRIVATE(o)  (G_TYPE_INSTANCE_GET_PRIVATE ((o), VIK_TYPE_WMSC_MAP_SOURCE, VikWmscMapSourcePrivate))


@@ -67,6 +81,12 @@ enum
   PROP_REFERER,
   PROP_FOLLOW_LOCATION,
   PROP_CHECK_FILE_SERVER_TIME,
   PROP_REFERER,
   PROP_FOLLOW_LOCATION,
   PROP_CHECK_FILE_SERVER_TIME,

+  PROP_ZOOM_MIN,
+  PROP_ZOOM_MAX,
+  PROP_LAT_MIN,
+  PROP_LAT_MAX,
+  PROP_LON_MIN,
+  PROP_LON_MAX,

 };
 
 G_DEFINE_TYPE (VikWmscMapSource, vik_wmsc_map_source, VIK_TYPE_MAP_SOURCE_DEFAULT);
 };
 
 G_DEFINE_TYPE (VikWmscMapSource, vik_wmsc_map_source, VIK_TYPE_MAP_SOURCE_DEFAULT);


@@ -83,6 +103,12 @@ vik_wmsc_map_source_init (VikWmscMapSource *self)
   priv->options.follow_location = 0;
   priv->options.check_file = a_check_map_file;
   priv->options.check_file_server_time = FALSE;
   priv->options.follow_location = 0;
   priv->options.check_file = a_check_map_file;
   priv->options.check_file_server_time = FALSE;

+  priv->zoom_min = 0;
+  priv->zoom_max = 18;
+  priv->lat_min = -90.0;
+  priv->lat_max = 90.0;
+  priv->lon_min = -180.0;
+  priv->lon_max = 180.0;

 
   g_object_set (G_OBJECT (self),
                 "tilesize-x", 256,
 
   g_object_set (G_OBJECT (self),
                 "tilesize-x", 256,


@@ -141,6 +167,30 @@ vik_wmsc_map_source_set_property (GObject      *object,
       priv->options.check_file_server_time = g_value_get_boolean (value);
       break;
 
       priv->options.check_file_server_time = g_value_get_boolean (value);
       break;
 

+    case PROP_ZOOM_MIN:
+      priv->zoom_min = g_value_get_uint (value);
+      break;
+
+    case PROP_ZOOM_MAX:
+      priv->zoom_max = g_value_get_uint (value);
+      break;
+
+    case PROP_LAT_MIN:
+      priv->lat_min = g_value_get_double (value);
+      break;
+
+    case PROP_LAT_MAX:
+      priv->lat_max = g_value_get_double (value);
+      break;
+
+    case PROP_LON_MIN:
+      priv->lon_min = g_value_get_double (value);
+      break;
+
+    case PROP_LON_MAX:
+      priv->lon_max = g_value_get_double (value);
+      break;
+

     default:
       /* We don't have any other property... */
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
     default:
       /* We don't have any other property... */
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);


@@ -178,7 +228,31 @@ vik_wmsc_map_source_get_property (GObject    *object,
     case PROP_CHECK_FILE_SERVER_TIME:
       g_value_set_boolean (value, priv->options.check_file_server_time);
       break;
     case PROP_CHECK_FILE_SERVER_TIME:
       g_value_set_boolean (value, priv->options.check_file_server_time);
       break;

-         
+
+    case PROP_ZOOM_MIN:
+      g_value_set_uint (value, priv->zoom_min);
+      break;
+
+    case PROP_ZOOM_MAX:
+      g_value_set_uint (value, priv->zoom_max);
+      break;
+
+    case PROP_LON_MIN:
+      g_value_set_double (value, priv->lon_min);
+      break;
+
+    case PROP_LON_MAX:
+      g_value_set_double (value, priv->lon_max);
+      break;
+
+    case PROP_LAT_MIN:
+      g_value_set_double (value, priv->lat_min);
+      break;
+
+    case PROP_LAT_MAX:
+      g_value_set_double (value, priv->lat_max);
+      break;
+

     default:
       /* We don't have any other property... */
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
     default:
       /* We don't have any other property... */
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);


@@ -202,7 +276,15 @@ vik_wmsc_map_source_class_init (VikWmscMapSourceClass *klass)
        grandparent_class->mapcoord_to_center_coord = _mapcoord_to_center_coord;
        grandparent_class->supports_download_only_new = _supports_download_only_new;
        grandparent_class->is_direct_file_access = _is_direct_file_access;
        grandparent_class->mapcoord_to_center_coord = _mapcoord_to_center_coord;
        grandparent_class->supports_download_only_new = _supports_download_only_new;
        grandparent_class->is_direct_file_access = _is_direct_file_access;

-       
+       grandparent_class->is_mbtiles = _is_mbtiles;
+       grandparent_class->is_osm_meta_tiles = _is_osm_meta_tiles;
+       grandparent_class->get_zoom_min = _get_zoom_min;
+       grandparent_class->get_zoom_max = _get_zoom_max;
+       grandparent_class->get_lat_min = _get_lat_min;
+       grandparent_class->get_lat_max = _get_lat_max;
+       grandparent_class->get_lon_min = _get_lon_min;
+       grandparent_class->get_lon_max = _get_lon_max;
+

        parent_class->get_uri = _get_uri;
        parent_class->get_hostname = _get_hostname;
        parent_class->get_download_options = _get_download_options;
        parent_class->get_uri = _get_uri;
        parent_class->get_hostname = _get_hostname;
        parent_class->get_download_options = _get_download_options;


@@ -244,6 +326,60 @@ vik_wmsc_map_source_class_init (VikWmscMapSourceClass *klass)
                                   G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE);
        g_object_class_install_property (object_class, PROP_CHECK_FILE_SERVER_TIME, pspec);
 
                                   G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE);
        g_object_class_install_property (object_class, PROP_CHECK_FILE_SERVER_TIME, pspec);
 

+       pspec = g_param_spec_uint ("zoom-min",
+                                  "Minimum zoom",
+                                  "Minimum Zoom level supported by the map provider",
+                                  0,  // minimum value,
+                                  22, // maximum value
+                                  0, // default value
+                                  G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE);
+       g_object_class_install_property (object_class, PROP_ZOOM_MIN, pspec);
+
+       pspec = g_param_spec_uint ("zoom-max",
+                                  "Maximum zoom",
+                                  "Maximum Zoom level supported by the map provider",
+                                  0,  // minimum value,
+                                  22, // maximum value
+                                  18, // default value
+                                  G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE);
+       g_object_class_install_property (object_class, PROP_ZOOM_MAX, pspec);
+
+       pspec = g_param_spec_double ("lat-min",
+                                    "Minimum latitude",
+                                    "Minimum latitude in degrees supported by the map provider",
+                                    -90.0,  // minimum value
+                                    90.0, // maximum value
+                                    -90.0, // default value
+                                    G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE);
+       g_object_class_install_property (object_class, PROP_LAT_MIN, pspec);
+
+       pspec = g_param_spec_double ("lat-max",
+                                    "Maximum latitude",
+                                    "Maximum latitude in degrees supported by the map provider",
+                                    -90.0,  // minimum value
+                                    90.0, // maximum value
+                                    90.0, // default value
+                                    G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE);
+       g_object_class_install_property (object_class, PROP_LAT_MAX, pspec);
+
+       pspec = g_param_spec_double ("lon-min",
+                                    "Minimum longitude",
+                                    "Minimum longitude in degrees supported by the map provider",
+                                    -180.0,  // minimum value
+                                    180.0, // maximum value
+                                    -180.0, // default value
+                                    G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE);
+       g_object_class_install_property (object_class, PROP_LON_MIN, pspec);
+
+       pspec = g_param_spec_double ("lon-max",
+                                    "Maximum longitude",
+                                    "Maximum longitude in degrees supported by the map provider",
+                                    -180.0,  // minimum value
+                                    180.0, // maximum value
+                                    180.0, // default value
+                                    G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE);
+       g_object_class_install_property (object_class, PROP_LON_MAX, pspec);
+

        g_type_class_add_private (klass, sizeof (VikWmscMapSourcePrivate));
        
        object_class->finalize = vik_wmsc_map_source_finalize;
        g_type_class_add_private (klass, sizeof (VikWmscMapSourcePrivate));
        
        object_class->finalize = vik_wmsc_map_source_finalize;


@@ -265,6 +401,18 @@ _is_direct_file_access ( VikMapSource *self )
        return FALSE;
 }
 
        return FALSE;
 }
 

+static gboolean
+_is_mbtiles ( VikMapSource *self )
+{
+       return FALSE;
+}
+
+static gboolean
+_is_osm_meta_tiles ( VikMapSource *self )
+{
+       return FALSE;
+}
+

 static gboolean
 _coord_to_mapcoord ( VikMapSource *self, const VikCoord *src, gdouble xzoom, gdouble yzoom, MapCoord *dest )
 {
 static gboolean
 _coord_to_mapcoord ( VikMapSource *self, const VikCoord *src, gdouble xzoom, gdouble yzoom, MapCoord *dest )
 {


@@ -360,9 +508,74 @@ _get_download_options( VikMapSourceDefault *self )
        VikWmscMapSourcePrivate *priv = VIK_WMSC_MAP_SOURCE_PRIVATE(self);
        return &(priv->options);
 }
        VikWmscMapSourcePrivate *priv = VIK_WMSC_MAP_SOURCE_PRIVATE(self);
        return &(priv->options);
 }

+/**
+ *
+ */
+static guint8
+_get_zoom_min (VikMapSource *self)
+{
+       g_return_val_if_fail (VIK_IS_WMSC_MAP_SOURCE(self), FALSE);
+       VikWmscMapSourcePrivate *priv = VIK_WMSC_MAP_SOURCE_PRIVATE(self);
+       return priv->zoom_min;
+}
+
+/**
+ *
+ */
+static guint8
+_get_zoom_max (VikMapSource *self)
+{
+       g_return_val_if_fail (VIK_IS_WMSC_MAP_SOURCE(self), FALSE);
+       VikWmscMapSourcePrivate *priv = VIK_WMSC_MAP_SOURCE_PRIVATE(self);
+       return priv->zoom_max;
+}
+
+/**
+ *
+ */
+static gdouble
+_get_lat_min (VikMapSource *self)
+{
+       g_return_val_if_fail (VIK_IS_WMSC_MAP_SOURCE(self), FALSE);
+       VikWmscMapSourcePrivate *priv = VIK_WMSC_MAP_SOURCE_PRIVATE(self);
+       return priv->lat_min;
+}
+
+/**
+ *
+ */
+static gdouble
+_get_lat_max (VikMapSource *self)
+{
+       g_return_val_if_fail (VIK_IS_WMSC_MAP_SOURCE(self), FALSE);
+       VikWmscMapSourcePrivate *priv = VIK_WMSC_MAP_SOURCE_PRIVATE(self);
+       return priv->lat_max;
+}
+
+/**
+ *
+ */
+static gdouble
+_get_lon_min (VikMapSource *self)
+{
+       g_return_val_if_fail (VIK_IS_WMSC_MAP_SOURCE(self), FALSE);
+       VikWmscMapSourcePrivate *priv = VIK_WMSC_MAP_SOURCE_PRIVATE(self);
+       return priv->lon_min;
+}
+
+/**
+ *
+ */
+static gdouble
+_get_lon_max (VikMapSource *self)
+{
+       g_return_val_if_fail (VIK_IS_WMSC_MAP_SOURCE(self), FALSE);
+       VikWmscMapSourcePrivate *priv = VIK_WMSC_MAP_SOURCE_PRIVATE(self);
+       return priv->lon_max;
+}

 
 VikWmscMapSource *
 
 VikWmscMapSource *

-vik_wmsc_map_source_new_with_id (guint8 id, const gchar *label, const gchar *hostname, const gchar *url)
+vik_wmsc_map_source_new_with_id (guint16 id, const gchar *label, const gchar *hostname, const gchar *url)

 {
        return g_object_new(VIK_TYPE_WMSC_MAP_SOURCE,
                            "id", id, "label", label, "hostname", hostname, "url", url, NULL);
 {
        return g_object_new(VIK_TYPE_WMSC_MAP_SOURCE,
                            "id", id, "label", label, "hostname", hostname, "url", url, NULL);