[marinemap] 4 new revisions pushed by perrygeo...@gmail.com on 2011-10-07 20:53 GMT
mari...@googlecode.com
Revision: 7f6671d76c16
Author: Matthew Perry <perryg...@gmail.com>
Date: Wed Oct 5 15:27:57 2011
Log: update layermapping for study region projection, dont transform
http://code.google.com/p/marinemap/source/detail?r=7f6671d76c16
Revision: 8d2f64072c8c
Author: Matthew Perry <perryg...@gmail.com>
Date: Wed Oct 5 15:28:49 2011
Log: Better error reporting and client-side behavior for async
analysis mod...
http://code.google.com/p/marinemap/source/detail?r=8d2f64072c8c
Revision: 0081f3c95f07
Author: Matthew Perry <perryg...@gmail.com>
Date: Wed Oct 5 15:29:20 2011
Log: merge
http://code.google.com/p/marinemap/source/detail?r=0081f3c95f07
Revision: ffc3498122df
Author: Matthew Perry <perryg...@gmail.com>
Date: Fri Oct 7 13:53:37 2011
Log: merge
http://code.google.com/p/marinemap/source/detail?r=ffc3498122df
==============================================================================
Revision: 7f6671d76c16
Author: Matthew Perry <perryg...@gmail.com>
Date: Wed Oct 5 15:27:57 2011
Log: update layermapping for study region projection, dont transform
http://code.google.com/p/marinemap/source/detail?r=7f6671d76c16
Modified:
/lingcod/studyregion/management/commands/create_study_region.py
=======================================
--- /lingcod/studyregion/management/commands/create_study_region.py Thu May
27 08:52:55 2010
+++ /lingcod/studyregion/management/commands/create_study_region.py Wed
Oct 5 15:27:57 2011
@@ -35,7 +35,7 @@
'name': 'name',
}
- lm = LayerMapping(StudyRegion, shapefile, mapping)
+ lm = LayerMapping(StudyRegion, shapefile, mapping, transform=False)
lm.save()
study_region = StudyRegion.objects.order_by('-creation_date')[0]
if options.get('region_name'):
==============================================================================
Revision: 8d2f64072c8c
Author: Matthew Perry <perryg...@gmail.com>
Date: Wed Oct 5 15:28:49 2011
Log: Better error reporting and client-side behavior for async
analysis models
http://code.google.com/p/marinemap/source/detail?r=8d2f64072c8c
Modified:
/lingcod/analysistools/templates/analysis/progress.html
/lingcod/analysistools/views.py
=======================================
--- /lingcod/analysistools/templates/analysis/progress.html Mon May 9
07:48:25 2011
+++ /lingcod/analysistools/templates/analysis/progress.html Wed Oct 5
15:28:49 2011
@@ -23,7 +23,7 @@
myshps.tree.selectNode(anode);
}
});
-
+ $('a.close').click();
});
});
</script>
=======================================
--- /lingcod/analysistools/views.py Mon May 9 07:48:25 2011
+++ /lingcod/analysistools/views.py Wed Oct 5 15:28:49 2011
@@ -16,8 +16,11 @@
progress = {
'complete': p[0],
'total': p[1],
- 'html': instance.status_html
- }
+ 'html': instance.status_html,
+ 'error': 0
+ }
+ if 'error' in instance.status_html.lower():
+ progress['error'] = 1
res = HttpResponse(simplejson.dumps(progress))
res['Content-Type'] = mimetypes.JSON
return res
==============================================================================
Revision: 0081f3c95f07
Author: Matthew Perry <perryg...@gmail.com>
Date: Wed Oct 5 15:29:20 2011
Log: merge
http://code.google.com/p/marinemap/source/detail?r=0081f3c95f07
==============================================================================
Revision: ffc3498122df
Author: Matthew Perry <perryg...@gmail.com>
Date: Fri Oct 7 13:53:37 2011
Log: merge
http://code.google.com/p/marinemap/source/detail?r=ffc3498122df