Merge pull request #10 from v-manip/diffprocess

Diffprocess

Author: santilland

eoxserver/contrib/vrt.py

@@ -100,9 +100,9 @@ def add_simple_source(self, band_index, src, src_band,
             try:
                 src = src.GetFileList()[0]
             except AttributeError:
-                raise ValueErrror("Expected string or GDAL Dataset.")
+                raise ValueError("Expected string or GDAL Dataset.")
             except IndexError:
-                raise ValueErrror("Supplied Dataset does not have a filename.")
+                raise ValueError("Supplied Dataset does not have a filename.")
 
         lines = [
             "<SimpleSource>",

eoxserver/resources/coverages/admin.py

@@ -328,4 +328,21 @@ class CubeCoverageAdmin(CoverageAdmin):
     model = models.CubeCoverage
     inlines = (DataItemInline, CollectionInline)
 
+    fieldsets = (
+        (None, {
+            'fields': ('identifier', )
+        }),
+        ('Metadata', {
+            'fields': ('range_type', 
+                       ('size_x', 'size_y'),
+                       ('min_x', 'min_y', 'min_z'),
+                       ('max_x', 'max_y', 'max_z'),
+                       ('srid', 'projection'),
+                       ('begin_time', 'end_time'),
+                       'vertical_cs_id', 'num_height_levels',
+                       'footprint'),
+            'description': 'Geospatial metadata'
+        }),
+    )
+
 admin.site.register(models.CubeCoverage, CubeCoverageAdmin)

eoxserver/resources/coverages/management/commands/eoxs_dataset_register.py

@@ -110,12 +110,12 @@ class Command(CommandOutputMixIn, BaseCommand):
         ),
 
         make_option("-e", "--extent", dest="extent", 
-            action="callback", callback=_variable_args_cb, default=None,
+            action="store", default=None,
             help=("Override extent.")
         ),
 
         make_option("--size", dest="size", 
-            action="callback", callback=_variable_args_cb,
+            action="store", default=None,
             help=("Override size.")
         ),
 
@@ -202,7 +202,7 @@ def handle_with_cache(self, cache, *args, **kwargs):
             try : 
                 ds = models.DatasetSeries.objects.get(identifier=parent_id)
                 parents.append( ds ) 
-            except DatasetSeries.DoesNotExist : 
+            except models.DatasetSeries.DoesNotExist : 
                 msg ="There is no Dataset Series matching the given" \
                         " identifier: '%s' "%parent_id
                 if ignore_missing_parent : 
@@ -352,7 +352,8 @@ def handle_with_cache(self, cache, *args, **kwargs):
 
 
     def _get_overrides(self, identifier=None, size=None, extent=None, 
-                       begin_time=None, end_time=None, footprint=None, **kwargs):
+                       begin_time=None, end_time=None, footprint=None, projection=None,
+                       **kwargs):
 
         overrides = {}
 
@@ -374,6 +375,12 @@ def _get_overrides(self, identifier=None, size=None, extent=None,
         if footprint:
             overrides["footprint"] = GEOSGeometry(footprint)
 
+        if projection:
+            try:
+                overrides["projection"] = int(projection)
+            except ValueError:
+                overrides["projection"] = projection
+
         return overrides
 
 
@@ -426,4 +433,4 @@ def _split_location(self, item):
 def save(model):
     model.full_clean()
     model.save()
-    return model
+    return model