Skip to content

Commit

Permalink
Fix for issue (#1968)
Browse files Browse the repository at this point in the history
Removed Trip from domain & range of hasPart & ispartOf
Introduced subTrip & ispartOfTrip properties in replacement
Updated examples & regenerated release files.
  • Loading branch information
Dataliberate committed Jul 17, 2018
1 parent f750717 commit cfa77b3
Show file tree
Hide file tree
Showing 48 changed files with 118,178 additions and 97,405 deletions.
18 changes: 9 additions & 9 deletions data/ext/pending/issue-1810-examples.txt
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ PRE-MARKUP:
Australia and New Zealand
</h1>
<p>
This trip is modeled as two distinct Tourist Trips using the hasPart property.
This trip is modeled as two distinct Tourist Trips using the subTrip property.
</p>
<div class="has-part-wrapper">
<div>
Expand All @@ -436,12 +436,12 @@ MICRODATA:
<div>
<div itemtype="http://schema.org/TouristTrip" itemscope>
<meta itemprop="name" content="Australia and New Zealand" />
<meta itemprop="description" content="This trip is modeled as two distinct Tourist Trips using the hasPart property." />
<div itemprop="hasPart" itemtype="http://schema.org/TouristTrip" itemscope>
<meta itemprop="description" content="This trip is modeled as two distinct Tourist Trips using the subTrip property." />
<div itemprop="subTrip" itemtype="http://schema.org/TouristTrip" itemscope>
<meta itemprop="name" content="Australia" />
<meta itemprop="description" content="This is a trip on its own." />
</div>
<div itemprop="hasPart" itemtype="http://schema.org/TouristTrip" itemscope>
<div itemprop="subTrip" itemtype="http://schema.org/TouristTrip" itemscope>
<meta itemprop="name" content="New Zealand" />
<meta itemprop="description" content="This is another trip nested inside the main one." />
</div>
Expand All @@ -453,14 +453,14 @@ RDFA:
<div>
<div vocab="http://schema.org/" typeof="TouristTrip">
<div property="name" content="Australia and New Zealand"></div>
<div property="description" content="This trip is modeled as two distinct Tourist Trips using the hasPart property."></div>
<div rel="hasPart">
<div property="description" content="This trip is modeled as two distinct Tourist Trips using the subTrip property."></div>
<div rel="subTrip">
<div typeof="TouristTrip">
<div property="name" content="Australia"></div>
<div property="description" content="This is a trip on its own."></div>
</div>
</div>
<div rel="hasPart">
<div rel="subTrip">
<div typeof="TouristTrip">
<div property="description" content="This is another trip nested inside the main one."></div>
<div property="name" content="New Zealand"></div>
Expand All @@ -475,8 +475,8 @@ JSON:
"@context": "http://schema.org",
"@type": "TouristTrip",
"name": "Australia and New Zealand",
"description": "This trip is modeled as two distinct Tourist Trips using the hasPart property.",
"hasPart": [
"description": "This trip is modeled as two distinct Tourist Trips using the subTrip property.",
"subTrip": [
{
"@type": "TouristTrip",
"name": "Australia",
Expand Down
20 changes: 14 additions & 6 deletions data/ext/pending/issue-1810.rdfa
Original file line number Diff line number Diff line change
Expand Up @@ -53,18 +53,26 @@
<span>Domain: <a property="http://schema.org/domainIncludes" href="http://schema.org/TouristTrip">TouristTrip</a></span>
<span>Category: <span property="schema:category">issue-1810</span></span>
</div>
<!-- Extending domain & range of hasPart property - already defined in core -->
<div typeof="rdf:Property" resource="http://schema.org/hasPart">
<span class="h" property="rdfs:label">hasPart</span>

<div typeof="rdf:Property" resource="http://schema.org/subTrip">
<span class="h" property="rdfs:label">subTrip</span>
<span property="rdfs:comment">Identifies a [[Trip]] that is a subTrip of this Trip. For example Day 1, Day 2, etc. of a multi-day trip.</span>
<link property="http://schema.org/isPartOf" href="http://pending.schema.org" />
<span>Domain: <a property="http://schema.org/domainIncludes" href="http://schema.org/Trip">Trip</a></span>
<span>rangeIncludes: <a property="http://schema.org/rangeIncludes" href="http://schema.org/Trip">Trip</a></span>
<link property="http://schema.org/inverseOf" href="http://schema.org/partOfTrip"/>
<span>Source: <a property="dc:source" href="http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#Tourism">Tourism</a></span>
<span>Category: <span property="schema:category">issue-1810</span></span>
</div>
<!-- Extending domain & range of hasPart property - already defined in core -->
<div typeof="rdf:Property" resource="http://schema.org/isPartOf">
<span class="h" property="rdfs:label">isPartOf</span>

<div typeof="rdf:Property" resource="http://schema.org/partOfTrip">
<span class="h" property="rdfs:label">partOfTrip</span>
<span property="rdfs:comment">Identifies that this [[Trip]] is a subTrip of another Trip. For example Day 1, Day 2, etc. of a multi-day trip.</span>
<link property="http://schema.org/isPartOf" href="http://pending.schema.org" />
<span>Domain: <a property="http://schema.org/domainIncludes" href="http://schema.org/Trip">Trip</a></span>
<span>rangeIncludes: <a property="http://schema.org/rangeIncludes" href="http://schema.org/Trip">Trip</a></span>
<link property="http://schema.org/inverseOf" href="http://schema.org/subTrip"/>
<span>Source: <a property="dc:source" href="http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#Tourism">Tourism</a></span>
<span>Category: <span property="schema:category">issue-1810</span></span>
</div>

Expand Down
10 changes: 6 additions & 4 deletions data/releases/3.4/all-layers-properties.csv
Original file line number Diff line number Diff line change
Expand Up @@ -294,9 +294,9 @@ Note: You can use <a class=""localLink"" href=""http://schema.org/minValue"">min
"http://schema.org/currenciesAccepted","currenciesAccepted","The currency accepted.<br/><br/>

Use standard formats: <a href=""http://en.wikipedia.org/wiki/ISO_4217"">ISO 4217 currency format</a> e.g. ""USD""; <a href=""https://en.wikipedia.org/wiki/List_of_cryptocurrencies"">Ticker symbol</a> for cryptocurrencies e.g. ""BTC""; well known names for <a href=""https://en.wikipedia.org/wiki/Local_exchange_trading_system"">Local Exchange Tradings Systems</a> (LETS) and other currency types e.g. ""Ithaca HOUR"".","","","","http://schema.org/LocalBusiness","http://schema.org/Text","","",""
"http://schema.org/currency","currency","The currency in which the monetary amount is expressed.<br/><br/>
"http://schema.org/currency","currency","The currency in which the monetary amount is expressed (in 3-letter <a href=""http://en.wikipedia.org/wiki/ISO_4217"">ISO 4217</a> format)., The currency in which the monetary amount is expressed.<br/><br/>

Use standard formats: <a href=""http://en.wikipedia.org/wiki/ISO_4217"">ISO 4217 currency format</a> e.g. ""USD""; <a href=""https://en.wikipedia.org/wiki/List_of_cryptocurrencies"">Ticker symbol</a> for cryptocurrencies e.g. ""BTC""; well known names for <a href=""https://en.wikipedia.org/wiki/Local_exchange_trading_system"">Local Exchange Tradings Systems</a> (LETS) and other currency types e.g. ""Ithaca HOUR""., The currency in which the monetary amount is expressed (in 3-letter <a href=""http://en.wikipedia.org/wiki/ISO_4217"">ISO 4217</a> format).","","","","http://schema.org/DatedMoneySpecification, http://schema.org/ExchangeRateSpecification, http://schema.org/LoanOrCredit, http://schema.org/MonetaryAmount, http://schema.org/MonetaryAmountDistribution","http://schema.org/Text","","",""
Use standard formats: <a href=""http://en.wikipedia.org/wiki/ISO_4217"">ISO 4217 currency format</a> e.g. ""USD""; <a href=""https://en.wikipedia.org/wiki/List_of_cryptocurrencies"">Ticker symbol</a> for cryptocurrencies e.g. ""BTC""; well known names for <a href=""https://en.wikipedia.org/wiki/Local_exchange_trading_system"">Local Exchange Tradings Systems</a> (LETS) and other currency types e.g. ""Ithaca HOUR"".","","","","http://schema.org/DatedMoneySpecification, http://schema.org/ExchangeRateSpecification, http://schema.org/LoanOrCredit, http://schema.org/MonetaryAmount, http://schema.org/MonetaryAmountDistribution","http://schema.org/Text","","",""
"http://schema.org/currentExchangeRate","currentExchangeRate","The current price of a currency.","","","","http://schema.org/ExchangeRateSpecification","http://schema.org/UnitPriceSpecification","","",""
"http://schema.org/customer","customer","Party placing the order or paying the invoice.","","","","http://schema.org/Invoice, http://schema.org/Order","http://schema.org/Organization, http://schema.org/Person","","",""
"http://schema.org/dataFeedElement","dataFeedElement","An item within in a data feed. Data feeds may have many elements.","","","","http://schema.org/DataFeed","http://schema.org/DataFeedItem, http://schema.org/Text, http://schema.org/Thing","","",""
Expand Down Expand Up @@ -574,7 +574,7 @@ Typical unit code(s): LTR for liters, GLL of US gallons, GLI for UK / imperial g
"http://schema.org/hasOccupation","hasOccupation","The Person's occupation. For past professions, use Role for expressing dates.","","","","http://schema.org/Person","http://schema.org/Occupation","","",""
"http://schema.org/hasOfferCatalog","hasOfferCatalog","Indicates an OfferCatalog listing for this Organization, Person, or Service.","","","","http://schema.org/Organization, http://schema.org/Person, http://schema.org/Service","http://schema.org/OfferCatalog","","",""
"http://schema.org/hasPOS","hasPOS","Points-of-Sales operated by the organization or person.","","","","http://schema.org/Organization, http://schema.org/Person","http://schema.org/Place","","",""
"http://schema.org/hasPart","hasPart","Indicates an item or CreativeWork that is part of this item, or CreativeWork (in some sense).","","","http://schema.org/containsSeason, http://schema.org/episode, http://schema.org/hasDefinedTerm, http://schema.org/season","http://schema.org/CreativeWork, http://schema.org/Trip","http://schema.org/CreativeWork, http://schema.org/Trip","http://schema.org/isPartOf","",""
"http://schema.org/hasPart","hasPart","Indicates an item or CreativeWork that is part of this item, or CreativeWork (in some sense).","","","http://schema.org/containsSeason, http://schema.org/episode, http://schema.org/hasDefinedTerm, http://schema.org/season","http://schema.org/CreativeWork","http://schema.org/CreativeWork","http://schema.org/isPartOf","",""
"http://schema.org/headline","headline","Headline of the article.","","","","http://schema.org/CreativeWork","http://schema.org/Text","","",""
"http://schema.org/healthCondition","healthCondition","Specifying the health condition(s) of a patient, medical study, or other target audience.","","","","http://schema.org/MedicalStudy, http://schema.org/Patient, http://schema.org/PeopleAudience","http://schema.org/MedicalCondition","","",""
"http://schema.org/healthPlanCoinsuranceOption","healthPlanCoinsuranceOption","Whether the coinsurance applies before or after deductible, etc. TODO: Is this a closed set?","","","","http://schema.org/HealthPlanCostSharingSpecification","http://schema.org/Text","","",""
Expand Down Expand Up @@ -661,7 +661,7 @@ See also <a class=""localLink"" href=""http://schema.org/eligibleRegion"">eligib
"http://schema.org/isFamilyFriendly","isFamilyFriendly","Indicates whether this content is family friendly.","","","","http://schema.org/CreativeWork","http://schema.org/Boolean","","",""
"http://schema.org/isGift","isGift","Was the offer accepted as a gift for someone other than the buyer.","","","","http://schema.org/Order","http://schema.org/Boolean","","",""
"http://schema.org/isLiveBroadcast","isLiveBroadcast","True is the broadcast is of a live event.","","","","http://schema.org/BroadcastEvent","http://schema.org/Boolean","","",""
"http://schema.org/isPartOf","isPartOf","Indicates an item or CreativeWork that this item, or CreativeWork (in some sense), is part of.","","","http://schema.org/inDefinedTermSet, http://schema.org/partOfEpisode, http://schema.org/partOfSeason, http://schema.org/partOfSeries, http://schema.org/partOfTVSeries","http://schema.org/CreativeWork, http://schema.org/Trip","http://schema.org/CreativeWork, http://schema.org/Trip","http://schema.org/hasPart","",""
"http://schema.org/isPartOf","isPartOf","Indicates an item or CreativeWork that this item, or CreativeWork (in some sense), is part of.","","","http://schema.org/inDefinedTermSet, http://schema.org/partOfEpisode, http://schema.org/partOfSeason, http://schema.org/partOfSeries, http://schema.org/partOfTVSeries","http://schema.org/CreativeWork","http://schema.org/CreativeWork","http://schema.org/hasPart","",""
"http://schema.org/isProprietary","isProprietary","True if this item's name is a proprietary/brand name (vs. generic name).","","","","http://schema.org/DietarySupplement, http://schema.org/Drug","http://schema.org/Boolean","","",""
"http://schema.org/isRelatedTo","isRelatedTo","A pointer to another, somehow related product (or multiple products).","","","","http://schema.org/Product, http://schema.org/Service","http://schema.org/Product, http://schema.org/Service","","",""
"http://schema.org/isSimilarTo","isSimilarTo","A pointer to another, functionally similar product (or multiple products).","","","","http://schema.org/Product, http://schema.org/Service","http://schema.org/Product, http://schema.org/Service","","",""
Expand Down Expand Up @@ -896,6 +896,7 @@ Typical unit code(s): C62 for person","","","","http://schema.org/Apartment, htt
"http://schema.org/partOfSeries","partOfSeries","The series to which this episode or season belongs.","http://schema.org/isPartOf","","","http://schema.org/Clip, http://schema.org/CreativeWorkSeason, http://schema.org/Episode","http://schema.org/CreativeWorkSeries","","http://schema.org/partOfTVSeries",""
"http://schema.org/partOfSystem","partOfSystem","The anatomical or organ system that this structure is part of.","","","","http://schema.org/AnatomicalStructure","http://schema.org/AnatomicalSystem","","",""
"http://schema.org/partOfTVSeries","partOfTVSeries","The TV series to which this episode or season belongs.","http://schema.org/isPartOf","","","http://schema.org/TVClip, http://schema.org/TVEpisode, http://schema.org/TVSeason","http://schema.org/TVSeries","","","http://schema.org/partOfSeries"
"http://schema.org/partOfTrip","partOfTrip","Identifies that this <a class=""localLink"" href=""http://schema.org/Trip"">Trip</a> is a subTrip of another Trip. For example Day 1, Day 2, etc. of a multi-day trip.","","","","http://schema.org/Trip","http://schema.org/Trip","http://schema.org/subTrip","",""
"http://schema.org/participant","participant","Other co-agents that participated in the action indirectly. e.g. John wrote a book with <em>Steve</em>.","","","http://schema.org/borrower, http://schema.org/buyer, http://schema.org/endorsee, http://schema.org/landlord, http://schema.org/lender, http://schema.org/loser, http://schema.org/opponent, http://schema.org/realEstateAgent, http://schema.org/recipient, http://schema.org/seller, http://schema.org/sender, http://schema.org/sportsTeam, http://schema.org/vendor, http://schema.org/winner","http://schema.org/Action","http://schema.org/Organization, http://schema.org/Person","","",""
"http://schema.org/partySize","partySize","Number of people the reservation should accommodate.","","","","http://schema.org/FoodEstablishmentReservation, http://schema.org/TaxiReservation","http://schema.org/Integer, http://schema.org/QuantitativeValue","","",""
"http://schema.org/passengerPriorityStatus","passengerPriorityStatus","The priority status assigned to a passenger for security or boarding (e.g. FastTrack or Priority).","","","","http://schema.org/FlightReservation","http://schema.org/QualitativeValue, http://schema.org/Text","","",""
Expand Down Expand Up @@ -1244,6 +1245,7 @@ Note that Event uses startDate/endDate instead of startTime/endTime, even when d
"http://schema.org/subStageSuffix","subStageSuffix","The substage, e.g. 'a' for Stage IIIa.","","","","http://schema.org/MedicalConditionStage","http://schema.org/Text","","",""
"http://schema.org/subStructure","subStructure","Component (sub-)structure(s) that comprise this anatomical structure.","","","","http://schema.org/AnatomicalStructure","http://schema.org/AnatomicalStructure","","",""
"http://schema.org/subTest","subTest","A component test of the panel.","","","","http://schema.org/MedicalTestPanel","http://schema.org/MedicalTest","","",""
"http://schema.org/subTrip","subTrip","Identifies a <a class=""localLink"" href=""http://schema.org/Trip"">Trip</a> that is a subTrip of this Trip. For example Day 1, Day 2, etc. of a multi-day trip.","","","","http://schema.org/Trip","http://schema.org/Trip","http://schema.org/partOfTrip","",""
"http://schema.org/subjectOf","subjectOf","A CreativeWork or Event about this Thing..","","","","http://schema.org/Thing","http://schema.org/CreativeWork, http://schema.org/Event","http://schema.org/about","",""
"http://schema.org/subtitleLanguage","subtitleLanguage","Languages in which subtitles/captions are available, in <a href=""http://tools.ietf.org/html/bcp47"">IETF BCP 47 standard format</a>.","","","","http://schema.org/Movie, http://schema.org/ScreeningEvent, http://schema.org/TVEpisode","http://schema.org/Language, http://schema.org/Text","","",""
"http://schema.org/subtype","subtype","A more specific type of the condition, where applicable, for example 'Type 1 Diabetes', 'Type 2 Diabetes', or 'Gestational Diabetes' for Diabetes.","","","","http://schema.org/MedicalCondition","http://schema.org/Text","","",""
Expand Down
Loading

0 comments on commit cfa77b3

Please sign in to comment.