[gbif-cvs] portal-web/src/main/java/org/gbif/portal/web/view/taxonomy TaxonConceptWidgetController.java, 1.7, 1.8

[davejmartin <dav...@us...>]

Update of /cvsroot/gbif/portal-web/src/main/java/org/gbif/portal/web/view/taxonomy
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv24209/src/main/java/org/gbif/portal/web/view/taxonomy

Modified Files:
	TaxonConceptWidgetController.java 
Log Message:
changes to make the maplayer stuff work - apologies if incorrect

Index: TaxonConceptWidgetController.java
===================================================================
RCS file: /cvsroot/gbif/portal-web/src/main/java/org/gbif/portal/web/view/taxonomy/TaxonConceptWidgetController.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** TaxonConceptWidgetController.java	19 Dec 2006 05:42:43 -0000	1.7
--- TaxonConceptWidgetController.java	22 Dec 2006 14:31:27 -0000	1.8
***************
*** 140,148 ****
  			}
  		}
! 		String extent = request.getParameter("extent");
  		// todo how do we get the url?
! 		String mapLayerUrl = mapContentProvider.getTaxonConceptLayerURL(zoom, "http://portaldev.gbif.org", taxonConcept.getKey(), extent);
! 		
! 		
  		String mapServerUrl = mapContentProvider.getMapServerURL();
  		request.setAttribute("mapServerUrl", mapServerUrl);		
--- 140,154 ----
  			}
  		}
! //		String extent = request.getParameter("extent");
  		// todo how do we get the url?
! 		// Suggestion: configure add it as a property to MapContentProvider and spring configure that up to point to the right place, however
! 		//dont you just want to use the contextpath in the JSP as all maplayers are now generated by the webapp?
! //		String mapLayerUrl = mapContentProvider.getTaxonConceptLayerURL(zoom, "http://portaldev.gbif.org", taxonConcept.getKey(), extent);
! 		String minLatitude = request.getParameter("minMapLat");
! 		String minLongitude = request.getParameter("minMapLong");		
! 		// todo how do we get the url?
! 		//Moved to MapContentProvider so that it is at least spring configurable - but perhaps belongs in the database
! //		String overviewMapUrl = mapContentProvider.getTaxonConceptOverviewURL(zoom, "http://portaldev.gbif.org", taxonConcept.getKey(), extent);
! 		String mapLayerUrl = mapContentProvider.getTaxonConceptLayerURL(zoom, mapContentProvider.getMapLayerServerURL(), taxonConcept.getKey(), minLatitude, minLongitude);		
  		String mapServerUrl = mapContentProvider.getMapServerURL();
  		request.setAttribute("mapServerUrl", mapServerUrl);		
***************
*** 183,188 ****
  		}
  		String extent = request.getParameter("extent");
  		// todo how do we get the url?
! 		String overviewMapUrl = mapContentProvider.getTaxonConceptOverviewURL(zoom, "http://portaldev.gbif.org", taxonConcept.getKey(), extent);
  		request.setAttribute("overviewMapUrl", overviewMapUrl);			
  	}
--- 189,198 ----
  		}
  		String extent = request.getParameter("extent");
+ 		String minLatitude = request.getParameter("minMapLat");
+ 		String minLongitude = request.getParameter("minMapLong");		
  		// todo how do we get the url?
! 		//Moved to MapContentProvider so that it is at least spring configurable - but perhaps belongs in the database
! //		String overviewMapUrl = mapContentProvider.getTaxonConceptOverviewURL(zoom, "http://portaldev.gbif.org", taxonConcept.getKey(), extent);
! 		String overviewMapUrl = mapContentProvider.getTaxonConceptLayerURL(zoom, mapContentProvider.getMapLayerServerURL(), taxonConcept.getKey(), minLatitude, minLongitude);		
  		request.setAttribute("overviewMapUrl", overviewMapUrl);			
  	}