Changeset 749 in products


Ignore:
Timestamp:
Jan 12, 2007 3:19:55 PM (17 years ago)
Author:
crchemist
Message:

Now Marker implements IPlacemark.

Location:
qPloneGoogleMaps/branches/qPloneGoogleMaps_with_geo_interfaces
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • qPloneGoogleMaps/branches/qPloneGoogleMaps_with_geo_interfaces/content/Marker.py

    r534 r749  
    99  from Products.Archetypes.public import * 
    1010 
    11 #from Products.ATContentTypes.content.base import ATCTContent 
     11from zope.interface import implements 
    1212from Products.ATContentTypes.content.document import ATDocumentSchema 
    1313from Products.ATContentTypes.content.document import ATDocument 
     
    1616from Products.qPloneGoogleMaps.field import * 
    1717from Products.qPloneGoogleMaps.config import * 
     18from geo.interfaces import IPlacemark 
    1819 
    1920MarkerSchema = ATDocumentSchema.copy() + Schema(( 
     
    5051    """ Map Marker """ 
    5152 
     53    implements(IPlacemark) 
    5254    schema          = MarkerSchema 
    5355 
     
    7476        return self.getLocation() 
    7577 
     78    name = property(""" see interface """) 
     79    visibility = property(""" see interface """) 
     80    open = property(""" see interface """) 
     81    address = property(""" see interface """) 
     82    AddressDetails = property(""" see interface """) 
     83    phoneNumber = property(""" see interface """) 
     84    Snippet = property(""" see interface """) 
     85    LookAt = property(""" see interface """) 
     86    StyleSelector = property(""" see interface """) 
     87    Region = property(""" see interface """) 
     88    geometry = property(""" see interface """) 
     89 
    7690registerType(Marker, PROJECTNAME) 
  • qPloneGoogleMaps/branches/qPloneGoogleMaps_with_geo_interfaces/tests/commonTestingStuff.py

    r534 r749  
    88from Products.CMFCore.utils import getToolByName 
    99 
    10 from Products.geolocation.interfaces.geolocation import IGEOLocated 
    11  
     10from geo.interfaces import IPoint 
     11from Products.geolocation.adapters.geolocation import Point 
    1212from Products.qPloneGoogleMaps.adapters.markers import MarkersListing 
    1313from Products.qPloneGoogleMaps.browser.markersview import MarkersView 
  • qPloneGoogleMaps/branches/qPloneGoogleMaps_with_geo_interfaces/tests/runalltests.py

    r534 r749  
    88#   python /path/to/Zope/utilities/testrunner.py -qa 
    99# 
    10  
     10import psyco 
     11psyco.full() 
    1112import os, sys 
    1213if __name__ == '__main__': 
  • qPloneGoogleMaps/branches/qPloneGoogleMaps_with_geo_interfaces/tests/testAdapters.py

    r534 r749  
    3636        self.folder.source_folder.invokeFactory('Document', 'test_page') 
    3737        folder_adapter = IMarkersListing(self.folder.source_folder) 
    38         self.failUnless(folder_adapter.listMarkers() == [], 
    39                         "listMarkers adapters' method return incorrect value") 
    40         IGEOLocated(self.folder.source_folder.test_page).setLocation(FIELD_VALUE[0], FIELD_VALUE[1]) 
     38        IPoint(self.folder.source_folder.test_page).coordinates = (FIELD_VALUE[0], FIELD_VALUE[1], 0) 
    4139        self.folder.source_folder.test_page.reindexObject() 
    4240        self.failUnless(folder_adapter.listMarkers()[0].getId == 'test_page', 
  • qPloneGoogleMaps/branches/qPloneGoogleMaps_with_geo_interfaces/tests/testMap.py

    r534 r749  
    116116        self.folder.invokeFactory('Folder', 'source_folder') 
    117117        self.folder.source_folder.invokeFactory('Document', 'test_page') 
    118         IGEOLocated(self.folder.source_folder.test_page).setLocation(FIELD_VALUE[0], FIELD_VALUE[1]) 
     118        IPoint(self.folder.source_folder.test_page).coordinates = (FIELD_VALUE[0], FIELD_VALUE[1], 0) 
    119119        self.folder.source_folder.test_page.reindexObject() 
    120120        self.test_map.invokeFactory('Overlay', 'test_overlay') 
  • qPloneGoogleMaps/branches/qPloneGoogleMaps_with_geo_interfaces/tests/testMarker.py

    r534 r749  
    44import os, sys, string 
    55if __name__ == '__main__': 
     6    #import psyco; psyco.full() 
    67    execfile(os.path.join(sys.path[0], 'framework.py')) 
    78 
    89from commonTestingStuff import * 
     10from Products.qPloneGoogleMaps.content.Marker import Marker 
     11from geo.interfaces import IPlacemark 
    912 
    1013class TestMarker(PloneTestCase.FunctionalTestCase): 
    1114    """ Test Marker content type""" 
     15 
     16    def testInterface(self): 
     17        verifyClass(IPlacemark, Marker) 
    1218 
    1319    def afterSetUp(self): 
  • qPloneGoogleMaps/branches/qPloneGoogleMaps_with_geo_interfaces/tests/testOverlay.py

    r534 r749  
    113113        self.folder.invokeFactory('Folder', 'source_folder') 
    114114        self.folder.source_folder.invokeFactory('Document', 'test_page') 
    115         IGEOLocated(self.folder.source_folder.test_page).setLocation(FIELD_VALUE[0], FIELD_VALUE[1]) 
     115        IPoint(self.folder.source_folder.test_page).coordinates = (FIELD_VALUE[0], FIELD_VALUE[1], 0) 
    116116        self.folder.source_folder.test_page.reindexObject() 
    117117        self.test_overlay.update(markerscolor=OVERLAY_COLOR) 
Note: See TracChangeset for help on using the changeset viewer.