diff --git a/Transportation.kif b/Transportation.kif index 4edb786f..f82b5963 100644 --- a/Transportation.kif +++ b/Transportation.kif @@ -3720,16 +3720,6 @@ This can include rail, road, air and water transitway.") located at a &%TransitTerminal and used in connection with its functions.") -(subclass TransitStop Region) -(documentation TransitStop EnglishLanguage "&%TransitStop is the subclass of places -where a vehicle of a scheduled or common carrier makes a stop to -discharge or take on passengers or goods.") - -(subclass TransitShelter Artifact) -(documentation TransitShelter EnglishLanguage "&%TransitShelter is the class of -structures that provide shelter for passengers waiting at a -&%TransitStop.") - (subclass HomeGarage Building) ;; also, garages are StorageAreas (subclass ParkingGarage Building) ;; also, StorageArea @@ -3767,17 +3757,71 @@ a &%Ship may be moored, whether at an &%Anchorage or dock.") regions where two or more &%Transitways meet and traffic may transfer from one transitway to another.") +(=> + (instance ?J TransitwayJunction) + (exists (?W1 ?A ?B ?W2 ?X ?Y) + (and + (instance ?W1 Transitway) + (routeBetween ?W1 ?A ?B) + (instance ?W2 Transitway) + (routeBetween ?W2 ?X ?Y) + (not + (equal ?W1 ?W2)) + (betweenOnPath ?A ?J ?B ?W1) + (betweenOnPath ?X ?J ?Y ?W2) + (connects ?J ?W1 ?W2)))) + +(=> + (and + (instance ?T Transportation) + (instance ?P1 Transitway) + (path ?T ?P1) + (conveyance ?T ?V) + (instance ?J TransitwayJunction) + (part ?J ?P1)) + (exists (?P2 ?M) + (and + (instance ?P2 Transitway) + (not + (equal ?P1 ?P2)) + (connects ?J ?P1 ?P2) + (capability Transfer path ?J) + (instance ?M Transfer) + (conveyance ?M ?V) + (meetsTemporally + (WhenFn ?T) + (WhenFn ?M)) + (modalAttribute (path ?M ?P2) Possibility)))) + +(=> + (and + (instance ?R1 Transitway) + (instance ?R2 Transitway) + (not + (equal ?R1 ?R2)) + (connects ?J ?R1 ?R2)) + (instance ?J TransitwayJunction)) + +(=> + (instance ?J TransitwayJunction) + (exists (?W1 ?W2) + (and + (instance ?W1 Transitway) + (instance ?W2 Transitway) + (connects ?J ?W1 ?W2) + (not + (equal ?W1 ?W2))))) + (subclass RoadJunction TransitwayJunction) (subclass RoadJunction Roadway) (documentation RoadJunction EnglishLanguage "&%RoadJunction is the subclass of &%TransitwayJunctions where two or more &%Roadways come together.") -(subclass RailJunction TransitwayJunction) -(subclass RailJunction Railway) - (documentation RailJunction EnglishLanguage "&%RailJunction is the subclass of &%TransitwayJunctions where two or more &%Railway lines come together.") +(subclass RailJunction TransitwayJunction) +(subclass RailJunction Railway) (subclass WaterJunction TransitwayJunction) (subclass WaterJunction Waterway) @@ -3785,19 +3829,6 @@ from one transitway to another.") (documentation WaterJunction EnglishLanguage "&%WaterJunction is the subclass of &%TransitwayJunctions where two or more &%Waterways come together.") -;;------------------------------------ -;; (E) 5. Transit Routes - -(subclass TransitRoute Region) - -(documentation TransitRoute EnglishLanguage "&%TransitRoute is the class of -&%Regions that are paths for &%Motion from one place to another.") - -(subclass AirRoute TransitRoute) - -(documentation AirRoute EnglishLanguage "An &%AirRoute is a region of air space that -can be travelled between points by an air &%TransportationDevice.") - ;;--------------------------------------------------------------------- ;; F. Trips diff --git a/development/Transport_2024.kif b/development/Transport_2024.kif index 98283e4c..c7768854 100644 --- a/development/Transport_2024.kif +++ b/development/Transport_2024.kif @@ -88,7 +88,7 @@ the west.[Wikipedia]") has a magnetic declination of &%PlaneAngleMeasure.") (domain MagneticDeclinationFn 1 Latitude) (domain MagneticDeclinationFn 2 Longitude) -(range MagneticDeclinationFn PlaneAngleMeasure) +(range MagneticDeclinationFn AngleMeasure) (names MagneticDeclinationFn "magnetic variation") (relatedInternalConcept MagneticDeclinationFn courseWRTCompassNorth) (relatedInternalConcept MagneticDeclinationFn courseWRTMagneticNorth) @@ -104,19 +104,19 @@ has a magnetic declination of &%PlaneAngleMeasure.") ; (equal ?P ; (LatitudeFn ?V (MeasureFn ?LAT AngularDegree))) ; (equal ?P -; (LongitudeFn ?H (MeasureFn ?LONG AngularDegree))) +; (LongitudeFn ?H (MeasureFn ?LONG AngularDegree))) ; (instance ?M Measuring) ; (eventLocated ?M ?P) ; (instrument ?M ?C) ; (instance ?C Compass) ; (result ?M ?MN) -; (instance ?MN PlaneAngleMeasure) -; (equal -; ?MN -; (courseWRTCompassNorth ?P NorthPole (MeasureFn ?X AngularDegree)))) -; (courseWRTTrueNorth ?P NorthPole (MeasureFn ?Y AngularDegree))) -;; relation can not be used as a function - +; (instance ?MN AngleMeasure) +; (equal ?MN (MeasureFn ?X AngularDegree))) +; (exists ?Y ?Z) +; (and +; (courseWRTTrueNorth ?P NorthPole (MeasureFn ?Y AngularDegree)) +; (MagneticDeclinationFn ?LAT ?LONG) + ;; North Pole (instance NorthPole GeographicArea) (documentation NorthPole Englishlanguage "The &%NorthPole is the point in the Northern diff --git a/domainEnglishFormat.kif b/domainEnglishFormat.kif index d9a4b6b4..d8fb6d69 100644 --- a/domainEnglishFormat.kif +++ b/domainEnglishFormat.kif @@ -6274,12 +6274,6 @@ ;; (termFormat JapaneseLanguage AirReconnaissance "航空偵察") ;; (termFormat GermanLanguage AirReconnaissance "Luftaufklärung") -(termFormat EnglishLanguage AirRoute "air route") -(termFormat ChineseTraditionalLanguage AirRoute "航路") -(termFormat ChineseLanguage AirRoute "航路") -;; (termFormat JapaneseLanguage AirRoute "エアルート") -;; (termFormat GermanLanguage AirRoute "Flugroute") - (termFormat EnglishLanguage AirStream "air stream") (termFormat ChineseTraditionalLanguage AirStream "氣流") (termFormat ChineseLanguage AirStream "气流") @@ -19736,7 +19730,7 @@ (termFormat EnglishLanguage DirectorJS "directorJS") (termFormat ChineseTraditionalLanguage DirectorJS "聯合參謀部指揮") -(termFormat ChineseLanguage DirectorJS "联合参谋部指挥) +(termFormat ChineseLanguage DirectorJS "联合参谋部指挥") ;; (termFormat JapaneseLanguage DirectorJS "directorJ") ;; (termFormat GermanLanguage DirectorJS "Regisseur") @@ -58913,25 +58907,7 @@ (termFormat ChineseLanguage TransitionalGovernment "过渡政府") ;; (termFormat JapaneseLanguage TransitionalGovernment "暫定政府") ;; (termFormat GermanLanguage TransitionalGovernment "Übergangsregierung") - -(termFormat EnglishLanguage TransitRoute "transit route") -(termFormat ChineseTraditionalLanguage TransitRoute "過境路線") -(termFormat ChineseLanguage TransitRoute "过境路线") -;; (termFormat JapaneseLanguage TransitRoute "通過ルート") -;; (termFormat GermanLanguage TransitRoute "Transitroute") - -(termFormat EnglishLanguage TransitShelter "transit shelter") -(termFormat ChineseTraditionalLanguage TransitShelter "過境避難所") -(termFormat ChineseLanguage TransitShelter "过境避难所") -;; (termFormat JapaneseLanguage TransitShelter "トランジットシェルター") -;; (termFormat GermanLanguage TransitShelter "Transitunterkunft") - -(termFormat EnglishLanguage TransitStop "transit stop") -(termFormat ChineseTraditionalLanguage TransitStop "中轉站") -(termFormat ChineseLanguage TransitStop "中转站") -;; (termFormat JapaneseLanguage TransitStop "トランジットストップ") -;; (termFormat GermanLanguage TransitStop "Transithaltestelle") - + (termFormat EnglishLanguage TransitSystem "transit system") (termFormat ChineseTraditionalLanguage TransitSystem "運輸系統") (termFormat ChineseLanguage TransitSystem "运输系统") diff --git a/pictureList.kif b/pictureList.kif index c960f3b3..6b5d534d 100644 --- a/pictureList.kif +++ b/pictureList.kif @@ -1631,7 +1631,6 @@ (externalImage AirportWithPavedRunway "http://upload.wikimedia.org/wikipedia/commons/4/4e/Flughafen_Frankfurt_am_Main.JPG") (externalImage AirPurificationEquipmentManufacturing "http://upload.wikimedia.org/wikipedia/commons/8/89/Air_purifier.JPG") ;; (externalImage AirReconnaissance "http://upload.wikimedia.org/wikipedia/en/e/ec/CPonte_Predator2.JPG") -;; (externalImage AirRoute "http://upload.wikimedia.org/wikipedia/en/3/39/Airline_hub-1995.jpg") ;; (externalImage AirStream "http://en.wikipedia.org/wiki/Image:Diagrama_de_formacion_de_la_brisa-breeze.png") (externalImage AirTrafficControl "http://upload.wikimedia.org/wikipedia/commons/e/ee/Towers_Schiphol_small.jpg") ;; (externalImage Aluminum "http://upload.wikimedia.org/wikipedia/commons/f/fc/Al-TableImage.svg") @@ -10299,7 +10298,7 @@ (externalImage TrackGauge "http://upload.wikimedia.org/wikipedia/commons/1/1f/Rail_gauge_world.png") (externalImage TraditionalSavingsAccount "http://upload.wikimedia.org/wikipedia/commons/4/4b/Soviet_Union-Savings-bank_book.jpg") ;; (externalImage Transfer "http://upload.wikimedia.org/wikipedia/commons/4/48/%60Intermodal_ship-to-rail_transfer.JPG") -(externalImage TransitRoute "http://upload.wikimedia.org/wikipedia/commons/b/b3/PlanMetroNY2.png") +(externalImage Transitway "http://upload.wikimedia.org/wikipedia/commons/b/b3/PlanMetroNY2.png") (externalImage TransitTerminal "http://upload.wikimedia.org/wikipedia/commons/e/eb/Rotterdam_Centraal_1.jpg") (externalImage Transitway "http://upload.wikimedia.org/wikipedia/en/9/97/Sydney_Tway_Network.png") (externalImage TranslationAndInterpretationServices "http://upload.wikimedia.org/wikipedia/commons/d/d4/2007TaipeiOlympicDayRun_SignLanguageTranslator.jpg") @@ -12023,14 +12022,12 @@ (externalImage Transfer "http://upload.wikimedia.org/wikipedia/commons/2/2f/Ponderosa_elevator.JPG") (externalImage Transfer "http://upload.wikimedia.org/wikipedia/commons/7/70/Escalators_Canary_Wharf.jpg") (externalImage Transfer "http://upload.wikimedia.org/wikipedia/commons/8/8c/Escrolantesgranvia.jpg") -;; (externalImage TransitRoute "http://upload.wikimedia.org/wikipedia/en/c/c2/El_Monte_Busway_Map.png") -(externalImage TransitRoute "http://upload.wikimedia.org/wikipedia/commons/6/64/Image-Interstate66-map.PNG") -(externalImage TransitRoute "http://upload.wikimedia.org/wikipedia/commons/b/ba/OWL-Verkehr2.png") -(externalImage TransitRoute "http://upload.wikimedia.org/wikipedia/commons/3/32/SchienenverkehrIstanbul2006InBetrieb.png") -(externalImage TransitRoute "http://upload.wikimedia.org/wikipedia/commons/1/15/1970_route_map_eng.png") -(externalImage TransitRoute "http://upload.wikimedia.org/wikipedia/commons/4/44/Tren_Urbano_Route.jpg") -;; (externalImage TransitRoute "http://upload.wikimedia.org/wikipedia/commons/0/03/Mrt_lrt_system_map.png") -(externalImage TransitRoute "http://upload.wikimedia.org/wikipedia/commons/b/b4/Bucharest-Metro-Map-2007.png") +(externalImage Transitway "http://upload.wikimedia.org/wikipedia/commons/6/64/Image-Interstate66-map.PNG") +(externalImage Transitway "http://upload.wikimedia.org/wikipedia/commons/b/ba/OWL-Verkehr2.png") +(externalImage Transitway "http://upload.wikimedia.org/wikipedia/commons/3/32/SchienenverkehrIstanbul2006InBetrieb.png") +(externalImage Transitway "http://upload.wikimedia.org/wikipedia/commons/1/15/1970_route_map_eng.png") +(externalImage Transitway "http://upload.wikimedia.org/wikipedia/commons/4/44/Tren_Urbano_Route.jpg") +(externalImage Transitway "http://upload.wikimedia.org/wikipedia/commons/b/b4/Bucharest-Metro-Map-2007.png") (externalImage TransitTerminal "http://upload.wikimedia.org/wikipedia/commons/b/b6/B10M_Mk4_interior.JPG") (externalImage TransitTerminal "http://upload.wikimedia.org/wikipedia/commons/5/59/Ne15_buangkok.jpg") (externalImage TransitTerminal "http://upload.wikimedia.org/wikipedia/commons/3/39/Ne13kovan.jpg") @@ -12039,8 +12036,6 @@ (externalImage TransitTerminal "http://upload.wikimedia.org/wikipedia/commons/e/ef/Beaucoup_passengers_at_nf_transit_terminal.jpg") (externalImage TransitTerminal "http://upload.wikimedia.org/wikipedia/commons/9/91/3d_letters_and_plaque_nf_transit_terminal.jpg") (externalImage TransitTerminal "http://upload.wikimedia.org/wikipedia/commons/a/a7/Greyhound_bus_heading_west_on_bridge.jpg") -(externalImage Transitway "http://upload.wikimedia.org/wikipedia/commons/b/b3/PlanMetroNY2.png") -;; (externalImage Transitway "http://upload.wikimedia.org/wikipedia/en/f/f6/Harbor_Transitway_Map.png") (externalImage TranslationAndInterpretationServices "http://upload.wikimedia.org/wikipedia/commons/8/8e/2007TaipeiOlympicDayRun_Deaflympics2009_SignLanguage.jpg") (externalImage Transparent "http://upload.wikimedia.org/wikipedia/commons/f/fe/Transparent_single_wh_1_ubt.jpeg") (externalImage Transparent "http://upload.wikimedia.org/wikipedia/commons/1/17/Bodysuit.jpg")